加价购修改

shopping-cart-application-service/src/main/java/cn/freemud/demo/controller/ShoppingCartDemoController.java

@@ -172,7 +172,7 @@ public class ShoppingCartDemoController {
          */
         ListCartGoodsRequestDTO baseRequestDTO = mapperFacade.map(request, ListCartGoodsRequestDTO.class);
         if (CollectionUtils.isNotEmpty(sendGoods)){
-            List<ListCartGoodsRequestDTO.SendGoods> newSendGoods = mapperFacade.mapAsList(sendGoods, ListCartGoodsRequestDTO.SendGoods.class);
+            List<ListCartGoodsBO.SendGoods> newSendGoods = mapperFacade.mapAsList(sendGoods, ListCartGoodsBO.SendGoods.class);
             baseRequestDTO.setSendGoods(newSendGoods);
         }
 

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/bo/goods/ListCartGoodsRequestDTO.java

 package cn.freemud.demo.entities.bo.goods;
 
+import cn.freemud.demo.entities.bo.goods.list.ListCartGoodsBO;
 import cn.freemud.demo.entities.dto.BaseRequestDTO;
 import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
 import lombok.Data;
@@ -61,7 +62,7 @@ public class ListCartGoodsRequestDTO extends BaseRequestDTO {
     /**
      * 加价购商品
      */
-    private List<SendGoods> sendGoods;
+    private List<ListCartGoodsBO.SendGoods> sendGoods;
 
     /**
      * 买一赠一寄件商品
@@ -103,22 +104,6 @@ public class ListCartGoodsRequestDTO extends BaseRequestDTO {
      */
     private String monthlyCardCode;
 
-    @Data
-    public final static class SendGoods {
-        /**
-         * 商品Id
-         */
-        @NotNull
-        private String goodsId;
-
-        private Long originalPrice;
-        /**
-         * 商品数量
-         */
-        @NotNull
-        private Integer qty;
-        private String activityCode;
-    }
 
     @Data
     public final static class BuyMemberCard {

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/PlatformListCartGoodsService.java

@@ -128,12 +128,12 @@ public class PlatformListCartGoodsService extends AbstractListCartGoodsService {
         }
 
         /*加价购商品不为空*/
-        if (CollectionUtils.isNotEmpty(sendGoodsList)) {
+        if (CollectionUtils.isNotEmpty(sendGoods)) {
             String activityCode = "";
             List<GetCalculationDiscountBO.CalculationSendGoodsReqVO> sends = new ArrayList<>();
             List<GetCalculationDiscountBO.CalculationActivityReqVO> selectActivityLists = new ArrayList<>();
             GetCalculationDiscountBO.CalculationActivityReqVO calculationActivityReqVO = new GetCalculationDiscountBO.CalculationActivityReqVO();
-            for (ListCartGoodsBO.SendGoods send : sendGoodsList) {
+            for (ShoppingCartInfoRequestVo.SendGoods send : sendGoods) {
                 GetCalculationDiscountBO.CalculationSendGoodsReqVO reqs = new GetCalculationDiscountBO.CalculationSendGoodsReqVO();
                 reqs.setGoodsId(send.getGoodsId());
                 reqs.setGoodsQuantity(send.getQty());