bug

gic-platform-enterprise-api/pom.xml

@@ -52,13 +52,6 @@
             <version>1.18.0</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.gic</groupId>
-            <artifactId>gic-marketing-process-api</artifactId>
-            <version>4.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
     </dependencies>
 
     <build>

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/SmsAppEnum.java

 package com.gic.enterprise.constant;
 
-import com.gic.marketing.process.api.utils.NoticeConstant;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * @author zhiwj
  * @Description: 短信消费应用场景
@@ -26,26 +22,6 @@ public enum SmsAppEnum {
     OTHER("other", "其他"),
     ;
 
-    public static Map<String, String> noticeMap = new HashMap<>();
-    static {
-        // 小程序验证码  ---->   会员开卡
-        noticeMap.put(NoticeConstant.NOTICE_WXA_VERIFY_CODE, SmsAppEnum.MEMBER_OPEN_CARD.code);
-        // 会员开卡  ---->   会员开卡
-        noticeMap.put(NoticeConstant.NOTICE_MEMBER_OPEN_CARD, SmsAppEnum.MEMBER_OPEN_CARD.code);
-        // 微商城发货  ---->   微商城
-        noticeMap.put(NoticeConstant.NOTICE_MALL_ORDER_DELIVERY, SmsAppEnum.GIC_MALL.code);
-        // 微商城订单待付款  ---->   微商城
-        noticeMap.put(NoticeConstant.NOTICE_MALL_ORDER_PAY, SmsAppEnum.GIC_MALL.code);
-        // 微商城取消订单  ---->   微商城
-        noticeMap.put(NoticeConstant.NOTICE_MALL_ORDER_CLOSE, SmsAppEnum.GIC_MALL.code);
-        // 积分商城发货  ---->   积分商城
-        noticeMap.put(NoticeConstant.NOTICE_INTEGRAL_ORDER_DELIVERY, SmsAppEnum.GIC_INTEGRAL.code);
-        // 积分商城待付款  ---->   积分商城
-        noticeMap.put(NoticeConstant.NOTICE_INTEGRAL_ORDER_PAY, SmsAppEnum.GIC_INTEGRAL.code);
-        // 积分商城取消订单  ---->   积分商城
-        noticeMap.put(NoticeConstant.NOTICE_INTEGRAL_ORDER_CLOSE, SmsAppEnum.GIC_INTEGRAL.code);
-    }
-
     private String code;
     private String name;
 
@@ -80,15 +56,4 @@ public enum SmsAppEnum {
         }
         return null;
     }
-
-    public static String getAppCode(String noticeCode) {
-//        noticeMap.getOrDefault()
-        String appCode = noticeMap.get(noticeCode);
-        if (StringUtils.isBlank(appCode)) {
-            return SmsAppEnum.OTHER.code;
-        } else {
-            return appCode;
-        }
-    }
-
 }

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/SmsTypeEnum.java

 package com.gic.enterprise.constant;
 
-import com.gic.marketing.process.api.utils.NoticeConstant;
-import org.apache.commons.lang3.StringUtils;
-
 /**
  * @author zhiwj
  * @Description: 短信消费类型
@@ -30,16 +27,4 @@ public enum SmsTypeEnum {
     public String getName() {
         return name;
     }
-
-    public static Integer getCodeByNoticeCode(String noticeCode) {
-        if (StringUtils.isBlank(noticeCode)) {
-            return SmsTypeEnum.MARKETING.code;
-        }
-        if (NoticeConstant.PARAMS_VERIFY_CODE.equals(noticeCode)) {
-            return SmsTypeEnum.AUTH_CODE.code;
-        } else {
-            return SmsTypeEnum.NOTICE.code;
-        }
-    }
-
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/SmsRecordApiServiceImpl.java

@@ -8,13 +8,13 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GICMQClientUtil;
 import com.gic.enterprise.constant.AccountStandardEnum;
 import com.gic.enterprise.constant.SmsAppEnum;
-import com.gic.enterprise.constant.SmsTypeEnum;
 import com.gic.enterprise.dto.InternationalSmsRecordDTO;
 import com.gic.enterprise.dto.SmsRecordDTO;
 import com.gic.enterprise.entity.TabBillingAccount;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseServiceResponse;
 import com.gic.enterprise.service.*;
+import com.gic.enterprise.utils.SmsUtils;
 import com.gic.member.api.dto.MemberUserDTO;
 import com.gic.member.api.dto.UserOwnerDTO;
 import com.gic.member.api.service.MemberUserApiService;
@@ -106,9 +106,9 @@ public class SmsRecordApiServiceImpl implements SmsRecordApiService {
         }
         if (StringUtils.isBlank(smsRecordDTO.getAppCode())) {
             // 没有应用场景的 通过通知code去匹配
-            smsRecordDTO.setAppCode(SmsAppEnum.getAppCode(smsRecordDTO.getNoticeCode()));
+            smsRecordDTO.setAppCode(SmsUtils.getAppCode(smsRecordDTO.getNoticeCode()));
         }
-        smsRecordDTO.setSmsType(SmsTypeEnum.getCodeByNoticeCode(smsRecordDTO.getNoticeCode()));
+        smsRecordDTO.setSmsType(SmsUtils.getCodeByNoticeCode(smsRecordDTO.getNoticeCode()));
 
 
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/utils/SmsUtils.java

+package com.gic.enterprise.utils;
+
+import com.gic.enterprise.constant.SmsAppEnum;
+import com.gic.enterprise.constant.SmsTypeEnum;
+import com.gic.marketing.process.api.utils.NoticeConstant;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-03-31 14:42
+ */
+public class SmsUtils {
+
+    private SmsUtils() { }
+
+    public static Map<String, String> noticeMap = new HashMap<>();
+    static {
+        // 小程序验证码  ---->   会员开卡
+        noticeMap.put(NoticeConstant.NOTICE_WXA_VERIFY_CODE, SmsAppEnum.MEMBER_OPEN_CARD.getCode());
+        // 会员开卡  ---->   会员开卡
+        noticeMap.put(NoticeConstant.NOTICE_MEMBER_OPEN_CARD, SmsAppEnum.MEMBER_OPEN_CARD.getCode());
+        // 微商城发货  ---->   微商城
+        noticeMap.put(NoticeConstant.NOTICE_MALL_ORDER_DELIVERY, SmsAppEnum.GIC_MALL.getCode());
+        // 微商城订单待付款  ---->   微商城
+        noticeMap.put(NoticeConstant.NOTICE_MALL_ORDER_PAY, SmsAppEnum.GIC_MALL.getCode());
+        // 微商城取消订单  ---->   微商城
+        noticeMap.put(NoticeConstant.NOTICE_MALL_ORDER_CLOSE, SmsAppEnum.GIC_MALL.getCode());
+        // 积分商城发货  ---->   积分商城
+        noticeMap.put(NoticeConstant.NOTICE_INTEGRAL_ORDER_DELIVERY, SmsAppEnum.GIC_INTEGRAL.getCode());
+        // 积分商城待付款  ---->   积分商城
+        noticeMap.put(NoticeConstant.NOTICE_INTEGRAL_ORDER_PAY, SmsAppEnum.GIC_INTEGRAL.getCode());
+        // 积分商城取消订单  ---->   积分商城
+        noticeMap.put(NoticeConstant.NOTICE_INTEGRAL_ORDER_CLOSE, SmsAppEnum.GIC_INTEGRAL.getCode());
+    }
+
+    public static String getAppCode(String noticeCode) {
+//        noticeMap.getOrDefault()
+        String appCode = noticeMap.get(noticeCode);
+        if (StringUtils.isBlank(appCode)) {
+            return SmsAppEnum.OTHER.getCode();
+        } else {
+            return appCode;
+        }
+    }
+
+    public static Integer getCodeByNoticeCode(String noticeCode) {
+        if (StringUtils.isBlank(noticeCode)) {
+            return SmsTypeEnum.MARKETING.getCode();
+        }
+        if (NoticeConstant.PARAMS_VERIFY_CODE.equals(noticeCode)) {
+            return SmsTypeEnum.AUTH_CODE.getCode();
+        } else {
+            return SmsTypeEnum.NOTICE.getCode();
+        }
+    }
+
+
+
+}