Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of…

Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -101,6 +101,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

@@ -193,6 +193,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;
 
     /**
      * 第一次使用会员卡需多支付的金额 单位为分
@@ -207,6 +207,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/ShoppingCartMCoffeeServiceImpl.java

@@ -115,13 +115,13 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         String spuId2 = spuId;
         List<Long> productIds = new ArrayList<>();
-        productIds.add(Long.parseLong(goodsId));
-        CartGoods addCartGoods = convent2CartGoods(addShoppingCartGoodsRequestVo);
-
-        if(StringUtils.isNotBlank(couponCode)){
-            String couponCodespq = CommonsConstant.COUPON_PREFIX + couponCode;
-            spuId2 = validCoupon(partnerId, storeId, couponCodespq, productIds,BusinessTypeEnum.getByType(addShoppingCartGoodsRequestVo.getMenuType()).getCode());
+        //商品券校验
+        if(spuId.startsWith(CommonsConstant.COUPON_PREFIX)){
+            couponCode = spuId.substring(CommonsConstant.COUPON_PREFIX.length());
+            spuId2 = validCoupon(partnerId, storeId, spuId, productIds,BusinessTypeEnum.getByType(addShoppingCartGoodsRequestVo.getMenuType()).getCode());
+            goodsId = spuId2;
         }
+        productIds.add(Long.parseLong(goodsId));
         // 获取添加商品的详细信息
         List<ProductBeanDTO> productBeanListSpuClass = assortmentSdkService.getProductsInfoSdk(partnerId, storeId, Collections.singletonList(spuId2), menuType, this.shoppingCartBaseService);
 
@@ -131,10 +131,9 @@ public class ShoppingCartMCoffeeServiceImpl {
             oldCartGoodsList = new ArrayList<>();
         }
 
-
-
         //商品券已添加情况校验
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = checkGoodsCoupon(oldCartGoodsList, operationType, couponCode);
+        CartGoods addCartGoods = convent2CartGoods(addShoppingCartGoodsRequestVo);
         setClassificationAndPrice(addCartGoods, productBeanListSpuClass);
         //查询多个商品库存信息
 //        Integer checkQty = this.checkSkuQty(oldCartGoodsList, addCartGoods);

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();
@@ -409,13 +410,15 @@ public class CalculationServiceImpl {
         }
         shoppingCartGoodsResponseVo.setOriginalTotalAmount(calculationDiscount == null ? totalOriginalAmount : calculationDiscount.getOriginalTotalAmount());
         shoppingCartGoodsResponseVo.setTotalAmount(calculationDiscount == null ? totalAmount : calculationDiscount.getTotalAmount());
+
+        shoppingCartGoodsResponseVo.setOriginalTotalAmount(shoppingCartGoodsResponseVo.getOriginalTotalAmount() + totalPackgeAmount);
+        shoppingCartGoodsResponseVo.setTotalAmount(shoppingCartGoodsResponseVo.getTotalAmount() + totalPackgeAmount);
         shoppingCartGoodsResponseVo.setNewPackAmount(totalPackgeAmount);
         shoppingCartGoodsResponseVo.setTotalDiscountAmount(calculationDiscount == null ? 0L : calculationDiscount.getTotalDiscountAmount());
         if(calculationDiscount != null && calculationDiscount.getDeliveryAmount() == null){
             shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
             shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount);
-            shoppingCartGoodsResponseVo.setOriginalTotalAmount(shoppingCartGoodsResponseVo.getOriginalTotalAmount() + deliveryAmount);
-            shoppingCartGoodsResponseVo.setTotalAmount(shoppingCartGoodsResponseVo.getTotalAmount() + deliveryAmount);
+
         }
     }
 

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

@@ -341,11 +341,11 @@ public class CouponDiscountCalculation {
                 continue;
             }
             // 过滤0得代金券
-            if (Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_1.getCode())
-                    && (couponStateVo.getOriginalPrice() == null
-                    || couponStateVo.getOriginalPrice() == 0)) {
-                continue;
-            }
+//            if (Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_1.getCode())
+//                    && (couponStateVo.getOriginalPrice() == null
+//                    || couponStateVo.getOriginalPrice() == 0)) {
+//                continue;
+//            }
 
             // 过滤折扣券为0折得
             if (Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_3.getCode())

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;
@@ -64,6 +66,10 @@ public class TimeSaleCalculation {
             if (goodsDiscount == null) {
                 continue;
             }
+            // 商品参与限时特价返回，用于前端显示特价标签
+            if(discounts.contains(ActivityTypeEnum.TYPE_2.getCode()) || discounts.contains(ActivityTypeEnum.TYPE_21.getCode())){
+                cartGoods.setActivityType(ActivityTypeEnum.TYPE_2.getCode());
+            }
             // 享受限时特价折扣的商品数量
             Integer specialActualGoodsNumber = null;
             // 商品现价
@@ -103,7 +109,7 @@ public class TimeSaleCalculation {
             return;
         }
         // 商品实际享受优惠的数量：  key:skuId;  value:实际数量
-        Map<String, Integer> numberMap = new HashMap<>();
+//        Map<String, Integer> numberMap = new HashMap<>();
         Map<String, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsMap = goodsList.parallelStream()
                 .collect(Collectors.toMap(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods::getGoodsId, Function.identity(), (k1, k2) -> k1));
 
@@ -113,28 +119,39 @@ public class TimeSaleCalculation {
             if ((goods = goodsMap.get(cartGoods.getSkuId())) == null || ObjectUtils.equals(ActivityTypeEnum.TYPE_81.getCode(), cartGoods.getActivityType())) {
                 continue;
             }
-            ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = getGoodsDiscount(goods.getDiscounts(), Arrays.asList(ActivityTypeEnum.TYPE_21.getCode(), ActivityTypeEnum.TYPE_2.getCode()));
+//            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_2.getCode(), ActivityTypeEnum.TYPE_21.getCode(), ActivityTypeEnum.TYPE_23.getCode()));
             if (goodsDiscount == null) {
                 continue;
             }
 
-            if (numberMap.get(cartGoods.getSkuId()) == null) {
-                numberMap.put(cartGoods.getSkuId(), goods.getActualGoodsNumber());
-            }
-            Integer actualGoodsNumber = numberMap.get(cartGoods.getSkuId());
-            if (actualGoodsNumber > 0) {
-                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.setActivityName(goodsDiscount.getActivityName());
+            Long totalDiscountAmount = goodsDiscount.getDiscount();
+            ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
+            activityDiscountsDto.setActivityCode(goodsDiscount.getActivityCode());
+            activityDiscountsDto.setActualActivityGoodsNumber(goodsDiscount.getActualGoodsNumber());
+            activityDiscountsDto.setActivityName(goodsDiscount.getActivityName());
+            if(ActivityTypeEnum.TYPE_23.getCode() == goodsDiscount.getType()){
+                activityDiscountsDto.setActivityType(ActivityTypeEnum.TYPE_23.getCode());
+            }else {
                 activityDiscountsDto.setActivityType(ActivityTypeEnum.TYPE_2.getCode());
-                activityDiscountsDto.setDiscountAmount(totalDiscountAmount.intValue());
-                cartGoods.getActivityDiscountsDtos().add(activityDiscountsDto);
-                cartGoods.setTotalDiscountAmount(cartGoods.getTotalDiscountAmount() + totalDiscountAmount.intValue());
-                numberMap.put(cartGoods.getSkuId(), actualGoodsNumber - cartGoods.getQty());
-            } else {
-                cartGoods.setTotalDiscountAmount(0);
             }
+            activityDiscountsDto.setDiscountAmount(totalDiscountAmount.intValue());
+            cartGoods.getActivityDiscountsDtos().add(activityDiscountsDto);
+            cartGoods.setTotalDiscountAmount(cartGoods.getTotalDiscountAmount() + totalDiscountAmount.intValue());
+//            if (numberMap.get(cartGoods.getSkuId()) == null) {
+//                numberMap.put(cartGoods.getSkuId(), goodsDiscount.getActualGoodsNumber());
+//            }
+//            Integer actualGoodsNumber = numberMap.get(cartGoods.getSkuId());
+//            if (actualGoodsNumber > 0) {
+//                Long totalDiscountAmount = cartGoods.getQty() > actualGoodsNumber ? goods.getDiscountAmount() * actualGoodsNumber / goods.getActualGoodsNumber() : goods.getDiscountAmount() * cartGoods.getQty() / goods.getActualGoodsNumber();
+//
+//                numberMap.put(cartGoods.getSkuId(), actualGoodsNumber - cartGoods.getQty());
+//            } else {
+//                cartGoods.setTotalDiscountAmount(0);
+//            }
 
         }
     }