coco增加商品代金券类型36

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

@@ -1382,6 +1382,9 @@ public class OrderSdkAdapter {
             case "GATHER_SPOT":
                 type=221;
                 break;
+            case "COCO_PRODUCT_CASH_COUPON":
+                type=36;
+                break;
             default:
                 break;
         }
@@ -1986,6 +1989,8 @@ public class OrderSdkAdapter {
                 newOrderAccountType=OldOrderAccountType.MEMBER_PRICE_DISCOUNT.getCode();
             case 99:
                 newOrderAccountType=OldOrderAccountType.FREIGHT_COUPON.getCode();
+            case 36:
+                newOrderAccountType=OldOrderAccountType.COCO_PRODUCT_CASH_COUPON.getCode();
             default:
                 break;
         }

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

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

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

@@ -43,7 +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商品代金券"),
+    COCO_PRODUCT_CASH_COUPON("COCO_PRODUCT_CASH_COUPON", "coco商品代金券"),
     ;
     private String code;
 

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

@@ -2565,7 +2565,7 @@ public class OrderAdapter {
 
         // coco商品代金券
         if (ActivityTypeEnum.TYPE_36.getCode().equals(activityType)){
-            return OldOrderAccountType.COCO_PROCUCT_CASH_COUPON;
+            return OldOrderAccountType.COCO_PRODUCT_CASH_COUPON;
         }
         return OldOrderAccountType.BUYM_SENDN;
     }

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

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

order-application-service/src/main/java/cn/freemud/service/coupon/impl/CocoCouponRelationServiceImpl.java

@@ -142,8 +142,10 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService {
             // 根据活动号转类型
             Integer orderAccountType = orderSdkAdapter.getOldOrderAccountType(settlementType);
 
-            // 不是商品券、代金券、折扣券不处理
-            if(!OrderAccountType.COUPON.getCode().equals(orderAccountType) &&
+
+            // 不是商品券、代金券、折扣券、商品代金券不处理
+            if(!OrderAccountType.COCO_PRODUCT_CASH_COUPON.getCode().equals(orderAccountType) &&
+                    !OrderAccountType.COUPON.getCode().equals(orderAccountType) &&
                     !OrderAccountType.PRODUCT_COUPON.getCode().equals(orderAccountType) &&
                     !OrderAccountType.DISCOUNT_COUPON.getCode().equals(orderAccountType)){
                 continue;