核销券添加商城渠道

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/constant/ActivityChannelEnum.java

@@ -3,7 +3,8 @@ package com.freemud.sdk.api.assortment.shoppingcart.constant;
 public enum ActivityChannelEnum {
     // pickup-到店取餐 deliver-外卖
     pickup("pickup", "到店取餐"),
-    delivery("delivery", "外卖");
+    delivery("delivery", "外卖"),
+    saasmall("saasmall", "外卖");
 
     private String code;
 

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/constant/CreateOrderType.java

@@ -15,7 +15,8 @@ package com.freemud.sdk.api.assortment.shoppingcart.constant;
 public enum CreateOrderType {
 
     COLLECT_GOODS(1, "到店自取"),
-    TAKE_OUT(2, "外卖");
+    TAKE_OUT(2, "外卖"),
+    SAASMALL(3, "商城");
 
     private Integer code;
     private String desc;

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/util/PropertyConvertUtil.java

@@ -12,6 +12,8 @@ public class PropertyConvertUtil {
             return ActivityChannelEnum.delivery;
         } else if (Objects.equals(CreateOrderType.COLLECT_GOODS.getCode(), orderType)) {
             return ActivityChannelEnum.pickup;
+        } else if (Objects.equals(CreateOrderType.SAASMALL.getCode(), orderType)) {
+            return ActivityChannelEnum.saasmall;
         } else {
             return null;
         }

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

@@ -3,7 +3,8 @@ package cn.freemud.enums;
 public enum ActivityChannelEnum {
     // pickup-到店取餐 deliver-外卖
     pickup("pickup", "到店取餐"),
-    delivery("delivery", "外卖");
+    delivery("delivery", "外卖"),
+    saasmall("saasmall", "外卖");
 
     private String code;
 

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

@@ -15,7 +15,8 @@ package cn.freemud.enums;
 public enum CreateOrderType {
 
     TAKE_OUT(2, "外卖"),
-    COLLECT_GOODS(1, "到店");
+    COLLECT_GOODS(1, "到店"),
+    SAASMALL(3, "商城");
 
     private Integer code;
     private String desc;

order-application-service/src/main/java/cn/freemud/utils/PropertyConvertUtil.java

@@ -13,7 +13,9 @@ public class PropertyConvertUtil {
             return ActivityChannelEnum.delivery;
         } else if (Objects.equals(CreateOrderType.COLLECT_GOODS.getCode(), orderType)) {
             return ActivityChannelEnum.pickup;
-        } else {
+        }else if (Objects.equals(CreateOrderType.SAASMALL.getCode(), orderType)) {
+            return ActivityChannelEnum.saasmall;
+        }else {
             return ActivityChannelEnum.pickup;
         }
     }
@@ -23,6 +25,8 @@ public class PropertyConvertUtil {
             return ActivityChannelEnum.delivery;
         } else if (Objects.equals(OrderType.COLLECT_GOODS.getCode(), orderType) || Objects.equals(OrderType.EAT_IN.getCode(), orderType)) {
             return ActivityChannelEnum.pickup;
+        }else if (Objects.equals(CreateOrderType.SAASMALL.getCode(), orderType)) {
+            return ActivityChannelEnum.saasmall;
         } else {
             return ActivityChannelEnum.pickup;
         }

shopping-cart-application-service/src/main/java/cn/freemud/utils/PropertyConvertUtil.java

@@ -25,7 +25,9 @@ public class PropertyConvertUtil {
             return ActivityChannelEnum.delivery;
         } else if (Objects.equals(OrderType.COLLECT_GOODS.getCode(), orderType) || Objects.equals(OrderType.EAT_IN.getCode(), orderType)) {
             return ActivityChannelEnum.pickup;
-        } else {
+        }  else if (Objects.equals(CreateOrderType.SAASMALL.getCode(), orderType)) {
+            return ActivityChannelEnum.saasmall;
+        }else {
             return ActivityChannelEnum.pickup;
         }
     }