cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.dayouqiantu.cn/develop/yshop

Browse Source
This commit is contained in:
LIONCITYS\lioncity
2020-09-10 14:48:28 +08:00
parent 2716986de1 16b25ffd5d
commit 5c4448eb7c
4 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java
View File

@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@ -50,6 +51,7 @@ import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @author hupeng
@ -119,7 +121,12 @@ public class StoreCombinationController {
.eq(YxStoreProductAttrResult::getProductId,yxStoreCombination.getProductId()).last("limit 1"));
JSONObject result = JSON.parseObject(storeProductAttrResult.getResult());
List<YxStoreProductAttrValue> attrValues = storeProductAttrValueService.list(new LambdaQueryWrapper<YxStoreProductAttrValue>().eq(YxStoreProductAttrValue::getProductId, yxStoreCombination.getProductId()));
List<ProductFormatDto> productFormatDtos = generator.convert(attrValues, ProductFormatDto.class);
List<ProductFormatDto> productFormatDtos =attrValues.stream().map(i ->{
ProductFormatDto productFormatDto = new ProductFormatDto();
BeanUtils.copyProperties(i,productFormatDto);
productFormatDto.setPic(i.getImage());
return productFormatDto;
}).collect(Collectors.toList());
if(SpecTypeEnum.TYPE_1.getValue().equals(yxStoreCombination.getSpecType())){
productDto.setAttr(new ProductFormatDto());
productDto.setAttrs(productFormatDtos);

10
yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java
View File

@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@ -39,6 +40,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author hupeng
@ -135,8 +137,12 @@ public class StoreSeckillController {
JSONObject result = JSON.parseObject(storeProductAttrResult.getResult());
List<YxStoreProductAttrValue> attrValues = storeProductAttrValueService.list(new LambdaQueryWrapper<YxStoreProductAttrValue>().eq(YxStoreProductAttrValue::getProductId, yxStoreSeckill.getProductId()));
List<ProductFormatDto> productFormatDtos = generator.convert(attrValues, ProductFormatDto.class);
List<ProductFormatDto> productFormatDtos =attrValues.stream().map(i ->{
ProductFormatDto productFormatDto = new ProductFormatDto();
BeanUtils.copyProperties(i,productFormatDto);
productFormatDto.setPic(i.getImage());
return productFormatDto;
}).collect(Collectors.toList());
if(SpecTypeEnum.TYPE_1.getValue().equals(yxStoreSeckill.getSpecType())){
productDto.setAttr(new ProductFormatDto());
productDto.setAttrs(productFormatDtos);

9
yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java
View File

@ -36,6 +36,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@ -57,6 +58,7 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @author hupeng
@ -186,7 +188,12 @@ public class StoreProductController {
.eq(YxStoreProductAttrResult::getProductId,id).last("limit 1"));
JSONObject result = JSON.parseObject(storeProductAttrResult.getResult());
List<YxStoreProductAttrValue> attrValues = storeProductAttrValueService.list(new LambdaQueryWrapper<YxStoreProductAttrValue>().eq(YxStoreProductAttrValue::getProductId, yxStoreProduct.getId()));
List<ProductFormatDto> productFormatDtos = generator.convert(attrValues, ProductFormatDto.class);
List<ProductFormatDto> productFormatDtos =attrValues.stream().map(i ->{
ProductFormatDto productFormatDto = new ProductFormatDto();
BeanUtils.copyProperties(i,productFormatDto);
productFormatDto.setPic(i.getImage());
return productFormatDto;
}).collect(Collectors.toList());
if(SpecTypeEnum.TYPE_1.getValue().equals(yxStoreProduct.getSpecType())){
productDto.setAttr(new ProductFormatDto());
productDto.setAttrs(productFormatDtos);