app拼团列表

mall-service/src/main/java/com/txz/mall/controller/CombinationController.java

@@ -10,6 +10,7 @@ import com.txz.mall.model.StoreCombination;
 import com.txz.mall.service.StoreCombinationService;
 import com.txz.mall.service.StoreOrderService;
 import dto.GoPinkDTO;
+import dto.StoreProductDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -119,15 +120,22 @@ public class CombinationController {
         return Result.success(storeCombination);
     }
 
-    @PostMapping("/list")
+    @PostMapping("/app/list")
     @ApiOperation(value = "拼团商品表获取列表")
-    public Result<List<StoreCombination>> list(@RequestBody StoreCombination storeCombination, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+    public Result<List<StoreCombination>> list(@RequestBody StoreProductDTO dto, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
         PageHelper.startPage(page, size);
 
-        Condition condition = new Condition(storeCombination.getClass());
+        Condition condition = new Condition(StoreCombination.class);
         Example.Criteria criteria = condition.createCriteria();
         criteria.andEqualTo("isDelete", 0);
+        criteria.andEqualTo("isShow", 1);
         condition.setOrderByClause("create_time DESC");
+        if (dto.getIsNew() != null) {
+            criteria.andEqualTo("isNew", 1);
+        }
+        if (dto.getMinPrice() != null && dto.getMaxPrice() != null) {
+            criteria.andBetween("price", dto.getMinPrice(), dto.getMaxPrice());
+        }
         PageInfo pageInfo = null;
         try {
             List<StoreCombination> list = storeCombinationService.findByCondition(condition);

mall-service/src/main/java/com/txz/mall/controller/ProductController.java

@@ -139,46 +139,6 @@ public class ProductController {
         return Result.success(pageInfo);
     }
 
-    @PostMapping("/combination/list")
-    @ApiOperation(value = "商品拼团列表")
-    public Result<List<StoreProduct>> appList(@RequestBody StoreProductDTO dto, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
-        PageHelper.startPage(page, size);
-        Condition condition = new Condition(StoreProduct.class);
-        Criteria criteria = condition.createCriteria();
-        criteria.andEqualTo("isDelete", 0);
-        condition.setOrderByClause("create_time DESC");
-        criteria.andEqualTo("isShow", 1);
-        criteria.andEqualTo("isPink", 1);
-        if (StringUtils.isNotBlank(dto.getStoreName())) {
-            criteria.andLike("storeName", "%" + dto.getStoreName() + "%");
-        }
-        if (StringUtils.isNotBlank(dto.getItemNumber())) {
-            criteria.andLike("itemNumber", "%" + dto.getItemNumber() + "%");
-        }
-        if (dto.getIsNew() != null) {
-            criteria.andEqualTo("isNew", 1);
-        }
-        if (dto.getCateId() != null) {
-            criteria.andEqualTo("cateId", dto.getCateId());
-        }
-        if (dto.getIsRecycle() != null) {
-            criteria.andEqualTo("isRecycle", dto.getIsRecycle());
-        }
-        if (dto.getMinPrice() != null && dto.getMaxPrice() != null) {
-            criteria.andBetween("price", dto.getMinPrice(), dto.getMaxPrice());
-        }
-        PageInfo pageInfo = null;
-        try {
-            List<StoreProduct> list = storeProductService.findByCondition(condition);
-            pageInfo = new PageInfo(list);
-        } catch (Exception e) {
-            log.error("查询对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success(pageInfo);
-    }
-
-
     @ApiOperation("商品导入")
     @PostMapping("/import")
     public Result importFile(@JSONField(serialize = false) @RequestParam("file") MultipartFile file) {
@@ -236,7 +196,6 @@ public class ProductController {
     public Result<String> save(@RequestBody @Validated StoreProductAddRequest request) {
         storeProductService.save(request);
         return Result.success();
-
     }
 
 }

mall-service/src/main/java/com/txz/mall/service/impl/StoreCombinationServiceImpl.java

@@ -56,15 +56,21 @@ public class StoreCombinationServiceImpl extends AbstractService<StoreCombinatio
             if (CollectionUtils.isEmpty(productCollect)) {
                 continue;
             }
-            BeanUtils.copyProperties(productCollect.get(0), storeCombination);
-            storeCombination.setProductName(productCollect.get(0).getStoreName());
-            storeCombination.setStock(productCollect.get(0).getStock());
+            StoreProduct storeProduct = productCollect.get(0);
+            BeanUtils.copyProperties(storeProduct, storeCombination);
+            storeCombination.setProductName(storeProduct.getStoreName());
+            storeCombination.setImages(storeProduct.getSliderImage());
+            storeCombination.setInfo(storeProduct.getStoreInfo());
+            storeCombination.setStock(storeProduct.getStock());
+            storeCombination.setCost(storeProduct.getCost());
             storeCombination.setStartTime(flashActivity.getStartTime());
             storeCombination.setStopTime(flashActivity.getEndTime());
             if (activityVO != null) {
                 storeCombination.setPeople(activityVO.getGroupNumber());
                 storeCombination.setEffectiveTime(activityVO.getCountdownTime());
-                storeCombination.setStock(activityVO.getInventory());
+                if (activityVO.getInventory() != null) {
+                    storeCombination.setStock(activityVO.getInventory());
+                }
             }
             storeCombination.setTitle(flashActivity.getName());
             storeCombination.setActivityId(activityId);