代码调整

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/controller/CartsApiController.java

@@ -2,7 +2,7 @@ package com.xingxi.api.controller;
 
 import com.xingxi.api.common.BaseApiController;
 import com.xingxi.api.model.CartsRequest;
-import com.xingxi.api.model.CartsResponse;
+import com.xingxi.api.model.CartsListResponse;
 import com.xingxi.api.service.CartsServiceI;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -19,32 +19,32 @@ public class CartsApiController extends BaseApiController {
     private final CartsServiceI cartsService;
 
     @GetMapping("/list")
-    public CartsResponse list(CartsRequest request){
+    public CartsListResponse list(CartsRequest request){
         return cartsService.list(getUserContext(), request);
     }
 
     @PostMapping("/add")
-    public CartsResponse add(@RequestBody @Valid CartsRequest request){
+    public CartsListResponse add(@RequestBody @Valid CartsRequest request){
         return cartsService.add(getUserContext(),  request);
     }
 
     @PostMapping("/checked")
-    public CartsResponse checked(@RequestBody @Valid CartsRequest request){
+    public CartsListResponse checked(@RequestBody @Valid CartsRequest request){
         return cartsService.checked(getUserContext(), request);
     }
 
     @PostMapping("/checkedAll")
-    public CartsResponse checkedAll(@RequestBody @Valid CartsRequest request){
+    public CartsListResponse checkedAll(@RequestBody @Valid CartsRequest request){
         return cartsService.checkedAll(getUserContext(), request);
     }
 
     @PostMapping("/uncheckedAll")
-    public CartsResponse uncheckedAll(@RequestBody @Valid CartsRequest request){
+    public CartsListResponse uncheckedAll(@RequestBody @Valid CartsRequest request){
         return cartsService.uncheckedAll(getUserContext(),  request);
     }
 
     @PostMapping("/delete")
-    public CartsResponse delete(@Valid @RequestBody CartsRequest request){
+    public CartsListResponse delete(@Valid @RequestBody CartsRequest request){
         return cartsService.delete(getUserContext(),  request);
     }
 

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/CartsListResponse.java

@@ -0,0 +1,12 @@
+package com.xingxi.api.model;
+
+import com.xingxi.business.Carts.domain.Carts;
+import lombok.Value;
+
+import java.util.List;
+
+@Value
+public class CartsListResponse {
+    List<CartsResponse> carts;
+    String checkedSumAmount;
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/CartsResponse.java

@@ -1,12 +1,30 @@
 package com.xingxi.api.model;
 
-import com.xingxi.business.Carts.domain.Carts;
-import lombok.Value;
+import com.xingxi.master.product.domain.ProdPic;
+import lombok.Data;
 
 import java.util.List;
 
-@Value
+@Data
 public class CartsResponse {
-    List<Carts> carts;
-    String checkedSumAmount;
+
+    private Long id;
+
+    // 用户ID
+    private Long userId;
+
+    // 商品ID
+    private Long prodId;
+
+    // 商品属性ID
+    private Long prodAttrId;
+
+    // 数量
+    private Integer quantity;
+
+    // 是否选中
+    private String checkFlag;
+
+    private List<ProdPic> prodPicList;
+
 }

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/CartsServiceI.java

@@ -5,16 +5,16 @@ import com.xingxi.api.model.*;
 
 public interface CartsServiceI {
 
-    CartsResponse add(UserContext userContext, CartsRequest request);
+    CartsListResponse add(UserContext userContext, CartsRequest request);
 
-    CartsResponse list(UserContext userContext, CartsRequest request);
+    CartsListResponse list(UserContext userContext, CartsRequest request);
 
-    CartsResponse checked(UserContext userContext, CartsRequest request);
+    CartsListResponse checked(UserContext userContext, CartsRequest request);
 
-    CartsResponse checkedAll(UserContext userContext, CartsRequest request);
+    CartsListResponse checkedAll(UserContext userContext, CartsRequest request);
 
-    CartsResponse uncheckedAll(UserContext userContext, CartsRequest request);
+    CartsListResponse uncheckedAll(UserContext userContext, CartsRequest request);
 
-    CartsResponse delete(UserContext userContext, CartsRequest request);
+    CartsListResponse delete(UserContext userContext, CartsRequest request);
 
 }

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/impl/CartsServiceImpl.java

@@ -2,6 +2,7 @@ package com.xingxi.api.service.impl;
 
 import com.xingxi.api.common.UserContext;
 import com.xingxi.api.model.CartsRequest;
+import com.xingxi.api.model.CartsListResponse;
 import com.xingxi.api.model.CartsResponse;
 import com.xingxi.api.service.CartsServiceI;
 import com.xingxi.business.Carts.domain.Carts;
@@ -12,9 +13,10 @@ import com.xingxi.common.enums.ERoleKey;
 import com.xingxi.common.enums.EYesNo;
 import com.xingxi.common.utils.DateUtils;
 import com.xingxi.common.utils.StringUtils;
-import com.xingxi.master.product.domain.Prod;
 import com.xingxi.master.product.domain.ProdAttrPrice;
+import com.xingxi.master.product.domain.ProdPic;
 import com.xingxi.master.product.mapper.ProdAttrPriceMapper;
+import com.xingxi.master.product.service.impl.ProdPicServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +24,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
@@ -34,9 +37,11 @@ class CartsServiceImpl implements CartsServiceI {
     CartsMapper cartsMapper;
     @Autowired
     ProdAttrPriceMapper prodAttrPriceMapper;
+    @Autowired
+    private ProdPicServiceImpl prodPicServiceImpl;
 
     @Override
-    public CartsResponse add(UserContext userContext, CartsRequest request) {
+    public CartsListResponse add(UserContext userContext, CartsRequest request) {
 
         SysUser currentUser = userContext.getCurrentUser();
         Long userId = currentUser.getUserId();
@@ -66,7 +71,7 @@ class CartsServiceImpl implements CartsServiceI {
     }
 
     @Override
-    public CartsResponse list(UserContext userContext, CartsRequest request) {
+    public CartsListResponse list(UserContext userContext, CartsRequest request) {
 
         SysUser currentUser = userContext.getCurrentUser();
         Long userId = currentUser.getUserId();
@@ -78,7 +83,28 @@ class CartsServiceImpl implements CartsServiceI {
         List<Carts> exiCarts = cartsMapper.selectCartsList(cond);
 
         BigDecimal sum = BigDecimal.ZERO;
+
+        List<CartsResponse> cartsResponseList = new ArrayList<>();
+
         for (Carts carts : exiCarts) {
+
+            CartsResponse cartsResponse = new CartsResponse();
+
+            cartsResponse.setId(carts.getId());
+            cartsResponse.setUserId(userId);
+            cartsResponse.setProdId(carts.getProdId());
+            cartsResponse.setProdAttrId(carts.getProdAttrId());
+            cartsResponse.setQuantity(carts.getQuantity());
+            cartsResponse.setCheckFlag(carts.getCheckFlag());
+
+            ProdPic condPic = new ProdPic();
+            condPic.setProdId(carts.getProdId());
+            condPic.setDelFlag(EDelFlag.NO.getVal());
+
+            List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);
+
+            cartsResponse.setProdPicList(picList);
+
             ProdAttrPrice condPrice = new ProdAttrPrice();
             condPrice.setProdAttrId(carts.getProdAttrId());
             condPrice.setProdId(carts.getProdId());
@@ -91,12 +117,13 @@ class CartsServiceImpl implements CartsServiceI {
                     sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(priceList.get(0).getPrice()));
                 }
             }
+            cartsResponseList.add(cartsResponse);
         }
-        return new CartsResponse(exiCarts, sum.toPlainString());
+        return new CartsListResponse(cartsResponseList, sum.toPlainString());
     }
 
     @Override
-    public CartsResponse checked(UserContext userContext, CartsRequest request) {
+    public CartsListResponse checked(UserContext userContext, CartsRequest request) {
 
         SysUser currentUser = userContext.getCurrentUser();
         Long userId = currentUser.getUserId();
@@ -112,6 +139,7 @@ class CartsServiceImpl implements CartsServiceI {
         cond.setUserId(userId);
         cond.setDelFlag(EDelFlag.NO.getVal());
 
+        List<CartsResponse> cartsResponseList = new ArrayList<>();
         List<Carts> exiCarts = cartsMapper.selectCartsList(cond);
         BigDecimal sum = BigDecimal.ZERO;
         for (Carts carts : exiCarts) {
@@ -127,13 +155,30 @@ class CartsServiceImpl implements CartsServiceI {
                     sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(priceList.get(0).getPrice()));
                 }
             }
+            CartsResponse cartsResponse = new CartsResponse();
+
+            cartsResponse.setId(carts.getId());
+            cartsResponse.setUserId(userId);
+            cartsResponse.setProdId(carts.getProdId());
+            cartsResponse.setProdAttrId(carts.getProdAttrId());
+            cartsResponse.setQuantity(carts.getQuantity());
+            cartsResponse.setCheckFlag(carts.getCheckFlag());
+
+            ProdPic condPic = new ProdPic();
+            condPic.setProdId(carts.getProdId());
+            condPic.setDelFlag(EDelFlag.NO.getVal());
+
+            List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);
+
+            cartsResponse.setProdPicList(picList);
+
         }
 
-        return new CartsResponse(exiCarts, sum.toPlainString());
+        return new CartsListResponse(cartsResponseList, sum.toPlainString());
     }
 
     @Override
-    public CartsResponse checkedAll(UserContext userContext, CartsRequest request) {
+    public CartsListResponse checkedAll(UserContext userContext, CartsRequest request) {
         SysUser currentUser = userContext.getCurrentUser();
         Long userId = currentUser.getUserId();
 
@@ -142,6 +187,7 @@ class CartsServiceImpl implements CartsServiceI {
         cond.setDelFlag(EDelFlag.NO.getVal());
 
         List<Carts> exiCarts = cartsMapper.selectCartsList(cond);
+        List<CartsResponse> cartsResponseList = new ArrayList<>();
         BigDecimal sum = BigDecimal.ZERO;
         for (Carts carts : exiCarts) {
             carts.setCheckFlag(EYesNo.YES.getVal());
@@ -159,13 +205,29 @@ class CartsServiceImpl implements CartsServiceI {
             if (StringUtils.isNotEmpty(priceList)) {
                 sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(priceList.get(0).getPrice()));
             }
+            CartsResponse cartsResponse = new CartsResponse();
+
+            cartsResponse.setId(carts.getId());
+            cartsResponse.setUserId(userId);
+            cartsResponse.setProdId(carts.getProdId());
+            cartsResponse.setProdAttrId(carts.getProdAttrId());
+            cartsResponse.setQuantity(carts.getQuantity());
+            cartsResponse.setCheckFlag(carts.getCheckFlag());
+
+            ProdPic condPic = new ProdPic();
+            condPic.setProdId(carts.getProdId());
+            condPic.setDelFlag(EDelFlag.NO.getVal());
+
+            List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);
+
+            cartsResponse.setProdPicList(picList);
         }
 
-        return new CartsResponse(exiCarts, sum.toPlainString());
+        return new CartsListResponse(cartsResponseList, sum.toPlainString());
     }
 
     @Override
-    public CartsResponse uncheckedAll(UserContext userContext, CartsRequest request) {
+    public CartsListResponse uncheckedAll(UserContext userContext, CartsRequest request) {
         SysUser currentUser = userContext.getCurrentUser();
         Long userId = currentUser.getUserId();
 
@@ -174,19 +236,38 @@ class CartsServiceImpl implements CartsServiceI {
         cond.setDelFlag(EDelFlag.NO.getVal());
 
         List<Carts> exiCarts = cartsMapper.selectCartsList(cond);
+        List<CartsResponse> cartsResponseList = new ArrayList<>();
+
         BigDecimal sum = BigDecimal.ZERO;
         for (Carts carts : exiCarts) {
             carts.setCheckFlag(EYesNo.YES.getVal());
             carts.setUpdateUser(userContext.getCurrentUser().getUserId().toString());
             carts.setUpdateTime(DateUtils.getNowDate());
             cartsMapper.updateCarts(carts);
+
+            CartsResponse cartsResponse = new CartsResponse();
+
+            cartsResponse.setId(carts.getId());
+            cartsResponse.setUserId(userId);
+            cartsResponse.setProdId(carts.getProdId());
+            cartsResponse.setProdAttrId(carts.getProdAttrId());
+            cartsResponse.setQuantity(carts.getQuantity());
+            cartsResponse.setCheckFlag(carts.getCheckFlag());
+
+            ProdPic condPic = new ProdPic();
+            condPic.setProdId(carts.getProdId());
+            condPic.setDelFlag(EDelFlag.NO.getVal());
+
+            List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);
+            cartsResponse.setProdPicList(picList);
+            cartsResponseList.add(cartsResponse);
         }
 
-        return new CartsResponse(exiCarts, sum.toPlainString());
+        return new CartsListResponse(cartsResponseList, sum.toPlainString());
     }
 
     @Override
-    public CartsResponse delete(UserContext userContext, CartsRequest request) {
+    public CartsListResponse delete(UserContext userContext, CartsRequest request) {
 
         SysUser currentUser = userContext.getCurrentUser();
         Long userId = currentUser.getUserId();
@@ -195,7 +276,11 @@ class CartsServiceImpl implements CartsServiceI {
 
         Carts cond = new Carts();
         cond.setUserId(userId);
+        cond.setDelFlag(EDelFlag.NO.getVal());
+
         List<Carts> exiCarts = cartsMapper.selectCartsList(cond);
+        List<CartsResponse> cartsResponseList = new ArrayList<>();
+
         BigDecimal sum = BigDecimal.ZERO;
         for (Carts carts : exiCarts) {
             ProdAttrPrice condPrice = new ProdAttrPrice();
@@ -208,8 +293,25 @@ class CartsServiceImpl implements CartsServiceI {
             if (StringUtils.isNotEmpty(priceList)) {
                 sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(priceList.get(0).getPrice()));
             }
+
+            CartsResponse cartsResponse = new CartsResponse();
+
+            cartsResponse.setId(carts.getId());
+            cartsResponse.setUserId(userId);
+            cartsResponse.setProdId(carts.getProdId());
+            cartsResponse.setProdAttrId(carts.getProdAttrId());
+            cartsResponse.setQuantity(carts.getQuantity());
+            cartsResponse.setCheckFlag(carts.getCheckFlag());
+
+            ProdPic condPic = new ProdPic();
+            condPic.setProdId(carts.getProdId());
+            condPic.setDelFlag(EDelFlag.NO.getVal());
+
+            List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);
+            cartsResponse.setProdPicList(picList);
+
         }
 
-        return new CartsResponse(exiCarts, sum.toPlainString());
+        return new CartsListResponse(cartsResponseList, sum.toPlainString());
     }
 }