买三赠一下单

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

@@ -1324,6 +1324,9 @@ public class OrderSdkAdapter {
             case "MEMBER_PRICE_DISCOUNT":
                 type=220;
                 break;
+            case "BUY3_SEND1":
+                type=35;
+                break;
             default:
                 break;
         }

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

@@ -30,6 +30,7 @@ public enum OldOrderAccountType {
     PREMIUM_EXCHANGE(22, "加价购", "PREMIUM_EXCHANGE"),
     SECOND_DISCOUNT(23, "第二件N折", "SECOND_DISCOUNT"),
     BUYM_SENDN(24, "买M赠N", "BUYM_SENDN"),
+    BUY3_SEND1(35, "买3赠1", "BUY3_SEND1"),
     SUPER_PURCHASE(47, "超值加购", "SUPER_PURCHASE"),
     CUSTOMER_SCORE(4, "积分兑换", "CUSTOMER_SCORE"),
     WEIXIN(203,"微信优惠","WECHAT_DISCOUNT"),

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

@@ -30,6 +30,7 @@ public enum QueryOrderAccountType {
     SUPER_PURCHASE("SUPER_PURCHASE", "超值加购"),
     SECOND_DISCOUNT("SECOND_DISCOUNT", "第二件N折"),
     BUYM_SENDN("BUYM_SENDN", "买M赠N"),
+    BUY3_SEND1("BUY3_SEND1", "买3赠1"),
     CUSTOMER_SCORE("CUSTOMER_SCORE", "积分兑换"),
     CARD_ORIGINAL_AMOUNT("CARD_ORIGINAL_AMOUNT", "会员卡原价"),
     SET_MEAL("SET_MEAL", "套餐商品优惠"),

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

@@ -174,7 +174,7 @@ public class OrderAdapter {
                 products.add(createOrderProductDto);
                 if (CollectionUtils.isNotEmpty(cartGoodsDetailDto.getActivityDiscountsDtos())) {
                     if(mcCafePartnerId.equals(createOrderDto.getCompanyId())) {
-                        createOrderProductDto.setAccounts(getMCCafeAccounts(createOrderProductDto, cartGoodsDetailDto.getActivityDiscountsDtos()));
+                        createOrderProductDto.setAccounts(getMCCafeAccounts(createOrderProductDto, cartGoodsDetailDto.getActivityDiscountsDtos(), createOrderVo));
                     } else {
                         createOrderProductDto.setAccounts(getAccounts(createOrderProductDto, cartGoodsDetailDto.getActivityDiscountsDtos()));
                     }
@@ -202,6 +202,11 @@ public class OrderAdapter {
                 if(null != activityDiscountsDto.getExtendType()) {
                     jsonObject.put("extendType", activityDiscountsDto.getExtendType());
                 }
+                if(ActivityTypeEnum.TYPE_35.getCode().equals(activityDiscountsDto.getActivityType())
+                        && StringUtils.isNotBlank(createOrderVo.getBuyThreeGiveOneCouponCode())
+                        && createOrderVo.getBuyThreeGiveOneCouponCode().equals(activityDiscountsDto.getActivityCode())) {
+                    jsonObject.put("buyThreeGiveOneActivityCode", createOrderVo.getBuyThreeGiveOneActivityCode());
+                }
                 createOrderAccountDto.setAddInfo(jsonObject.toJSONString());
             }
             orderAccountDtos.add(createOrderAccountDto);
@@ -377,7 +382,7 @@ public class OrderAdapter {
         return orderAccountDtos;
     }
 
-    public List<CreateOrderAccountRequest> getMCCafeAccounts(CreateOrderProductRequest createOrderProductDto, List<ActivityDiscountsDto> activityDiscountsDtos) {
+    public List<CreateOrderAccountRequest> getMCCafeAccounts(CreateOrderProductRequest createOrderProductDto, List<ActivityDiscountsDto> activityDiscountsDtos, CreateOrderVo createOrderVo) {
         List<CreateOrderAccountRequest> orderAccountDtos = new ArrayList<>();
         for (ActivityDiscountsDto activityDiscountsDto : activityDiscountsDtos) {
             CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder()
@@ -397,6 +402,11 @@ public class OrderAdapter {
             if(null != activityDiscountsDto.getExtendType()) {
                 jsonObject.put("extendType", activityDiscountsDto.getExtendType());
             }
+            if(ActivityTypeEnum.TYPE_35.getCode().equals(activityDiscountsDto.getActivityType())
+                    && StringUtils.isNotBlank(createOrderVo.getBuyThreeGiveOneCouponCode())
+                    && createOrderVo.getBuyThreeGiveOneCouponCode().equals(activityDiscountsDto.getActivityCode())) {
+                jsonObject.put("buyThreeGiveOneActivityCode", createOrderVo.getBuyThreeGiveOneActivityCode());
+            }
             createOrderAccountDto.setAddInfo(jsonObject.toJSONString());
             orderAccountDtos.add(createOrderAccountDto);
         }
@@ -2429,6 +2439,9 @@ public class OrderAdapter {
         if (ActivityTypeEnum.TYPE_34.getCode().equals(activityType)) {
             return OldOrderAccountType.FREIGHT_COUPON;
         }
+        if (ActivityTypeEnum.TYPE_35.getCode().equals(activityType)) {
+            return OldOrderAccountType.BUY3_SEND1;
+        }
         if (ActivityTypeEnum.TYPE_31.getCode().equals(activityType)) {
             return OldOrderAccountType.DISCOUNT_COUPON;
         }