活动键位编号对接

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -100,6 +100,7 @@ public class ShoppingCartConvertAdapter {
         cartGoodsDetailDto.setCategoryName(cartGoods.getCategoryName());
         cartGoodsDetailDto.setCouponCode(cartGoods.getCouponCode());
         cartGoodsDetailDto.setStockLimit(cartGoods.isStockLimit());
+        cartGoodsDetailDto.setProductCode(cartGoods.getCustomerCode());
         cartGoodsDetailDto.setCustomerCode(cartGoods.getCustomerCode());
         cartGoodsDetailDto.setWeight(cartGoods.getWeight());
         cartGoodsDetailDto.setUnit(cartGoods.getUnit());

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java

@@ -187,6 +187,11 @@ public class ActivityCalculationDiscountResponseDto {
             private Integer actualGoodsNumber;
             private List<GoodsDiscount> discounts;
 
+            /**
+             * 活动键位编号
+             */
+            private String artNo;
+
 
             @Data
             public static class GoodsDiscount {

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/activity/ActivityDiscountsDto.java

@@ -21,4 +21,9 @@ public class ActivityDiscountsDto {
     private String activityName;
     private Integer discountAmount;
     private Integer activityType;
+
+    /**
+     * 实际参与活动商品数量
+     */
+    private Integer actualActivityGoodsNumber;
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -20,7 +20,7 @@ public class ShoppingCartGoodsDto {
     /**
      * 购物车实际选择商品，包含加价购商品
      */
-    List<CartGoodsDetailDto> products;
+    private List<CartGoodsDetailDto> products;
     /**
      * 购物车版本号
      */
@@ -68,7 +68,7 @@ public class ShoppingCartGoodsDto {
     /**
      * 请求计算的商品均摊信息
      */
-    List<ShareDiscountActivityDto> shareDiscountActivityDtos;
+    private List<ShareDiscountActivityDto> shareDiscountActivityDtos;
 
     /**
      * 第一次使用会员卡需多支付的金额 单位为分
@@ -203,6 +203,10 @@ public class ShoppingCartGoodsDto {
          */
         private boolean isStockLimit;
         /**
+         * 商品货号
+         */
+        private String productCode;
+        /**
          * 第三方商品编码
          */
         private String customerCode;

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -196,6 +196,7 @@ public class CalculationServiceImpl {
             }
         }
 
+        //订单级别券优惠
         for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults discount : calculationDiscountResult.getCouponDiscounts()) {
             int discountAmount = (discount.getDiscountAmount() == null) ? 0 : discount.getDiscountAmount();
             Integer discountType = discount.getActivityType();

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/TimeSaleCalculation.java

@@ -8,6 +8,8 @@ import cn.freemud.entities.vo.CreateOrderVo;
 import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
 import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
 import cn.freemud.enums.ActivityTypeEnum;
+import cn.freemud.enums.ResponseResult;
+import cn.freemud.interceptor.ServiceException;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -113,6 +115,10 @@ public class TimeSaleCalculation {
             if ((goods = goodsMap.get(cartGoods.getSkuId())) == null || ObjectUtils.equals(ActivityTypeEnum.TYPE_81.getCode(), cartGoods.getActivityType())) {
                 continue;
             }
+//            if(goods.getArtNo() == null){
+//                throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
+//            }
+//            cartGoods.setCustomerCode(goods.getArtNo());
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = getGoodsDiscount(goods.getDiscounts(), Arrays.asList(ActivityTypeEnum.TYPE_21.getCode(), ActivityTypeEnum.TYPE_2.getCode()));
             if (goodsDiscount == null) {
                 continue;
@@ -126,6 +132,7 @@ public class TimeSaleCalculation {
                 Long totalDiscountAmount = cartGoods.getQty() > actualGoodsNumber ? goods.getDiscountAmount() * actualGoodsNumber / goods.getActualGoodsNumber() : goods.getDiscountAmount() * cartGoods.getQty() / goods.getActualGoodsNumber();
                 ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
                 activityDiscountsDto.setActivityCode(goodsDiscount.getActivityCode());
+                activityDiscountsDto.setActualActivityGoodsNumber(goodsDiscount.getActualGoodsNumber());
                 activityDiscountsDto.setActivityName(goodsDiscount.getActivityName());
                 activityDiscountsDto.setActivityType(ActivityTypeEnum.TYPE_2.getCode());
                 activityDiscountsDto.setDiscountAmount(totalDiscountAmount.intValue());