Merge branch 'feature/20210223-订单展示满赠商品-张志恒'

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

@@ -1396,6 +1396,9 @@ public class OrderSdkAdapter {
             case "COCO_PRODUCT_CASH_COUPON":
                 type=36;
                 break;
+            case "FULL_BUYM_SENDN":
+                type=230;
+                break;
             default:
                 break;
         }
@@ -2009,6 +2012,9 @@ public class OrderSdkAdapter {
             case 36:
                 newOrderAccountType=OldOrderAccountType.COCO_PRODUCT_CASH_COUPON.getCode();
                 break;
+            case 230:
+                newOrderAccountType=OldOrderAccountType.FULL_BUYM_SENDN.getCode();
+                break;
             default:
                 break;
         }

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

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

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

@@ -45,6 +45,7 @@ public enum QueryOrderAccountType {
     MCCAFE_MONTH_CARD("MCCAFE_MONTH_CARD","麦咖啡月卡"),
     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", "满赠"),
     ;
     private String code;
 

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

@@ -2161,6 +2161,9 @@ public class OrderAdapter {
                 if (OrderAccountType.BUYM_SENDN.getCode().equals(productDiscount.getDiscountType())) {
                     activityType = ActivityTypeEnum.TYPE_61.getCode();
                 }
+                if (OrderAccountType.BUYM_SENDN_230.getCode().equals(productDiscount.getDiscountType())) {
+                    activityType = ActivityTypeEnum.TYPE_230.getCode();
+                }
                 if (OrderAccountType.PRODUCT_COUPON.getCode().equals(productDiscount.getDiscountType())) {
                     activityType = ActivityTypeEnum.TYPE_32.getCode();
                     couponDiscount = productDiscount.getDiscountAmount();
@@ -2649,6 +2652,9 @@ public class OrderAdapter {
         if (ActivityTypeEnum.TYPE_36.getCode().equals(activityType)){
             return OldOrderAccountType.COCO_PRODUCT_CASH_COUPON;
         }
+        if (ActivityTypeEnum.TYPE_230.getCode().equals(activityType)){
+            return OldOrderAccountType.FULL_BUYM_SENDN;
+        }
         return OldOrderAccountType.BUYM_SENDN;
     }
 

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

@@ -57,7 +57,8 @@ public enum ActivityTypeEnum {
     TYPE_211(211, "套餐优惠"),
     TYPE_221(221, "集点活动"),
     TYPE_320(320, "会员价优惠"),
-    TYPE_36(36, "coco商品代金券");
+    TYPE_36(36, "coco商品代金券"),
+    TYPE_230(230, "满赠");
 
     private Integer code;
 

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

@@ -27,7 +27,8 @@ public enum OrderAccountType {
     CUSTOMER_SUB(4, "积分扣减"),
     CARD_ORIGINAL_AMOUNT(25, "会员卡原价"),
     CARD_DISCOUNT_AMOUNT(26, "会员卡优惠金额"),
-    COCO_PRODUCT_CASH_COUPON(36, "coco商品代金券");;
+    COCO_PRODUCT_CASH_COUPON(36, "coco商品代金券"),
+    BUYM_SENDN_230(230, "满赠");;
     private Integer code;
 
     private String desc;

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/ProductTypeEnum.java

@@ -29,6 +29,7 @@ public enum ProductTypeEnum {
     MATERIAL_PRODUCT(88,"加料商品"),
     LITTLE_MATERIAL_PRODUCT(89,"小料"),
     WITH_ORDER_VIRTUAL_PRODUCT(90,"随单购虚拟商品"),
+    BUYM_SENDN(230, "满赠")
     ;