Merge branch 'feature/20210329-单品立减平台化-lcf'

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1416,6 +1416,9 @@ public class OrderSdkAdapter {
             case "FULL_BUYM_SENDN":
                 type=230;
                 break;
+            case "SINGLE_PRODUCT_REDUCTION":
+                type=22;
+                break;
             default:
                 break;
         }
@@ -2032,6 +2035,9 @@ public class OrderSdkAdapter {
             case 230:
                 newOrderAccountType=OldOrderAccountType.FULL_BUYM_SENDN.getCode();
                 break;
+            case 22:
+                newOrderAccountType=OldOrderAccountType.SINGLE_PRODUCT_REDUCTION.getCode();
+                break;
             default:
                 break;
         }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java

@@ -46,7 +46,8 @@ public enum OldOrderAccountType {
     GATHER_SPOT(221, "集点活动","GATHER_SPOT"),
     MEMBER_PRICE_DISCOUNT(220, "会员价优惠", "MEMBER_PRICE_DISCOUNT"),
     COCO_PRODUCT_CASH_COUPON(36, "coco商品代金券","COCO_PRODUCT_CASH_COUPON"),
-    FULL_BUYM_SENDN(230, "满赠","FULL_BUYM_SENDN");
+    FULL_BUYM_SENDN(230, "满赠","FULL_BUYM_SENDN"),
+    SINGLE_PRODUCT_REDUCTION(22, "单品立减","SINGLE_PRODUCT_REDUCTION");
     private Integer code;
 
     private String desc;

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/QueryOrderAccountType.java

@@ -46,6 +46,7 @@ public enum QueryOrderAccountType {
     WITH_ORDER_BUY_COUPON_FEE("WITH_ORDER_BUY_COUPON_FEE", "随单买月卡"),
     COCO_PRODUCT_CASH_COUPON("COCO_PRODUCT_CASH_COUPON", "coco商品代金券"),
     FULL_BUYM_SENDN("FULL_BUYM_SENDN", "满赠"),
+    SINGLE_PRODUCT_REDUCTION("SINGLE_PRODUCT_REDUCTION", "单品立减")
     ;
     private String code;
 

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2675,6 +2675,9 @@ public class OrderAdapter {
         if (ActivityTypeEnum.TYPE_221.getCode().equals(activityType)){
             return OldOrderAccountType.GATHER_SPOT;
         }
+        if (ActivityTypeEnum.TYPE_22.getCode().equals(activityType)){
+            return OldOrderAccountType.SINGLE_PRODUCT_REDUCTION;
+        }
 
         // coco商品代金券
         if (ActivityTypeEnum.TYPE_36.getCode().equals(activityType)){

order-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java

@@ -24,6 +24,7 @@ public enum ActivityTypeEnum {
      */
     TYPE_2(2, "单品特价"),
     TYPE_21(21, "单品折扣"),
+    TYPE_22(22, "单品立减"),
     /**
      * 优惠券
      */

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

@@ -35,7 +35,7 @@ public class TimeSalePromotionService implements IPromotionService {
 
     @Override
     public void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, UserLoginInfoDto userLoginInfoDto, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
-        if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts()) || !calculationDiscountResult.getDiscounts().stream().anyMatch(discount -> (ActivityTypeEnum.TYPE_2.getCode().equals(discount.getType()) || (ActivityTypeEnum.TYPE_21.getCode().equals(discount.getType()))))) {
+        if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts()) || !calculationDiscountResult.getDiscounts().stream().anyMatch(discount -> (ActivityTypeEnum.TYPE_2.getCode().equals(discount.getType()) || (ActivityTypeEnum.TYPE_21.getCode().equals(discount.getType())) || ActivityTypeEnum.TYPE_22.getCode().equals(discount.getType())))) {
             return;
         }
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsList = calculationDiscountResult.getGoods();
@@ -47,7 +47,7 @@ public class TimeSalePromotionService implements IPromotionService {
                 .collect(Collectors.toMap(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods::getCartGoodsUid, Function.identity(), (k1, k2) -> k1));
         // 存储当前享受限时特价折扣的商品数量，key:goodsId; value:可享受数量
         Map<String, Integer> numberMap = new HashMap<>();
-        List<Integer> discounts = Arrays.asList(ActivityTypeEnum.TYPE_2.getCode(), ActivityTypeEnum.TYPE_21.getCode());
+        List<Integer> discounts = Arrays.asList(ActivityTypeEnum.TYPE_2.getCode(), ActivityTypeEnum.TYPE_21.getCode(), ActivityTypeEnum.TYPE_22.getCode());
         String uid = "";
         for (CartGoods cartGoods : cartGoodsList) {
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods goods;