Merge remote-tracking branch 'origin/feature/coco_new-刘鹏飞' into qa

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

@@ -43,7 +43,8 @@ public enum OldOrderAccountType {
     PRICE_DEDUCTION_COUPON(103, "抵价券", "PRICE_DEDUCTION_COUPON"),
     TOTAL_DISCOUNT(205, "优惠总金额", "TOTAL_DISCOUNT"),
     GATHER_SPOT(221, "集点活动","GATHER_SPOT"),
-    MEMBER_PRICE_DISCOUNT(220, "会员价优惠", "MEMBER_PRICE_DISCOUNT");
+    MEMBER_PRICE_DISCOUNT(220, "会员价优惠", "MEMBER_PRICE_DISCOUNT"),
+    COCO_PROCUCT_CASH_COUPON(36, "coco商品代金券","COCO_PROCUCT_CASH_COUPON");
     private Integer code;
 
     private String desc;

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

@@ -43,6 +43,7 @@ public enum QueryOrderAccountType {
     MEMBER_PRICE_DISCOUNT("MEMBER_PRICE_DISCOUNT","会员价优惠"),
     MCCAFE_MONTH_CARD("MCCAFE_MONTH_CARD","麦咖啡月卡"),
     WITH_ORDER_BUY_COUPON_FEE("WITH_ORDER_BUY_COUPON_FEE", "随单买月卡"),
+    COCO_PROCUCT_CASH_COUPON("COCO_PROCUCT_CASH_COUPON", "coco商品代金券"),
     ;
     private String code;
 

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

@@ -2579,6 +2579,14 @@ public class OrderAdapter {
         if (ActivityTypeEnum.TYPE_221.getCode().equals(activityType)){
             return OldOrderAccountType.GATHER_SPOT;
         }
+        if (ActivityTypeEnum.TYPE_221.getCode().equals(activityType)){
+            return OldOrderAccountType.GATHER_SPOT;
+        }
+
+        // coco商品代金券
+        if (ActivityTypeEnum.TYPE_36.getCode().equals(activityType)){
+            return OldOrderAccountType.COCO_PROCUCT_CASH_COUPON;
+        }
         return OldOrderAccountType.BUYM_SENDN;
     }
 

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

@@ -55,7 +55,8 @@ public enum ActivityTypeEnum {
     TYPE_DELIVERY(901, "配送费"),
     TYPE_211(211, "套餐优惠"),
     TYPE_221(221, "集点活动"),
-    TYPE_320(320, "会员价优惠");
+    TYPE_320(320, "会员价优惠"),
+    TYPE_36(36, "coco商品代金券");
 
     private Integer code;