重构

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/dto/goods/add/update/BaseUpdateGoodsQtyVO.java

@@ -11,103 +11,5 @@ import java.util.List;
 @Data
 public class BaseUpdateGoodsQtyVO {
 
-    @NotEmpty(message = "sessionId不能为空")
-    private String sessionId;
-
-    /**
-     * 商户Id
-     */
-    @NotEmpty(message = "partnerId不能为空")
-    private String partnerId;
-
-    /**
-     * 微信appId
-     */
-    @NotEmpty(message = "appId不能为空")
-    private String appId;
-
-    @NotEmpty(message = "spuId不能为空")
-    private String spuId;
-
-    private String skuId;
-
-    /**
-     * 商品额外的属性
-     */
-    private List<CartGoods.CartGoodsExtra> extra;
-
-    private String version;
-
-    /**
-     * 1.6.0 版本增加  节点ID
-     */
-    private String nodeId;
-    /**
-     * 1.6.0 版本增加 分类名
-     */
-    private String categoryName;
-
-    /**
-     * 套餐固定商品
-     */
-    private List<ComboxGoodsRequestVo> productComboList;
-    /**
-     * 套餐可选商品
-     */
-    private List<ComboxGoodsRequestVo> productGroupList;
-
-    /**
-     * 加料
-     */
-    private List<MaterialRequestVo> productMaterialList;
-
-    /**
-     * 门店Id
-     * 商城没有门店id，如果需要门店id必传在业务中进行校验
-     */
-    //@NotEmpty(message = "shopId不能为空")
-    private String shopId;
-
-
-    /**
-     * 下单类型 CreateOrderType 外卖、到店、商城
-     */
-    private Integer orderType;
-
-    /**
-     * 渠道类型 OrderChannelType
-     */
-    private String channelType;
-
-    private String appType;
-
-    private String tableNumber;
-    /**
-     * 数量
-     */
-    private Integer qty;
-
-
-    /**
-     * 业务类型： 0 : 自提 1：外卖 2：微商城
-     */
-    private String menuType ;
-
-    /**
-     * 收货地址ID、svc卡支付外卖订单必传
-     */
-    private String receiveId;
-
-    /**
-     * 操作类型 1= 添加商品券 2=加价购
-     */
-    private Integer operationType;
-
-    /**
-     * 优惠券号
-     */
-    private String couponCode;
-
-
 
 }

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

@@ -201,6 +201,7 @@ public abstract class AbstractUpdateGoodsQtyService implements UpdateGoodsQtySer
         }
 
         List<CartGoods> cartGoodsList = new ArrayList<>();
+        cartGoods.setQty(baseRequestBO.getQty());
         cartGoodsList.add(cartGoods);
         bo.setCartGoods(cartGoodsList);
 
@@ -742,6 +743,9 @@ public abstract class AbstractUpdateGoodsQtyService implements UpdateGoodsQtySer
         activityTypeEnums.add(ActivityTypeEnum.TYPE_31);
 
         GetActivityBO getActivityBO = new GetActivityBO();
+        getActivityBO.setActivityTypeEnums(activityTypeEnums);
+        getActivityBO.setActivityQueryDto(activityQueryDto);
+
         ActivityBO activityBO = promotionManager.queryActivityByType(getActivityBO, baseRequestDTO.getManagerService().getPromotionService());
         fullReduction.setActivityBO(activityBO);
         if (activityBO == null){