乔丹自研商城兼容

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/content/InteractRecordApiServiceImpl.java

@@ -17,6 +17,7 @@ import com.gic.haoban.manage.service.service.content.InteractRecordService;
 import com.gic.haoban.manage.service.service.content.PotentialCustomerService;
 import com.gic.haoban.manage.service.service.content.adaptor.MaterialEnterpriseAdaptor;
 import com.gic.haoban.manage.service.task.KafkaMessageServiceImpl;
+import com.gic.haoban.manage.service.util.OrderCheckUtil;
 import com.gic.member.api.dto.event.lifecycle.CreateMemberEventParam;
 import com.gic.member.api.dto.info.MemberSummaryInfoDTO;
 import com.gic.member.api.dto.info.qo.QueryMemberInfoDTO;
@@ -184,8 +185,9 @@ public class InteractRecordApiServiceImpl implements InteractRecordApiService {
             return ServiceResponse.success();
         }
         OrderInfoResp orderInfoResp = serviceResponse.getResult();
-        if (orderInfoResp.getOrderType() == null || OrderChannelEnum.WEIMOB.getSort() != orderInfoResp.getOrderType()) {
-            log.info("订单 {} 非微盟渠道", orderId);
+        if (orderInfoResp.getOrderType() == null ||
+                !OrderCheckUtil.checkOrderType(orderInfoResp.getOrderType())) {
+            log.info("订单 {} 非微盟/自研渠道", orderId);
             return ServiceResponse.success();
         }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/content/MallOrderStatusChangeApiServiceImpl.java

@@ -184,7 +184,7 @@ public class MallOrderStatusChangeApiServiceImpl implements MallOrderStatusChang
     }
 
     /**
-     * 处理微盟订单
+     * 处理微盟/自研订单
      * MQ： dealWeimoOrder
      * @param params
      * @return
@@ -192,7 +192,7 @@ public class MallOrderStatusChangeApiServiceImpl implements MallOrderStatusChang
     @Override
     public ServiceResponse<Void> dealWeimoOrder(String params) {
 
-        log.info("处理微盟订单 {}", params);
+        log.info("处理微盟/自研订单 {}", params);
 
         //订单分为tab_gic_eorder 和 tab_gic_ordeer
         MemberOrderBo memberOrderBo = JSON.parseObject(params, MemberOrderBo.class);
@@ -232,8 +232,9 @@ public class MallOrderStatusChangeApiServiceImpl implements MallOrderStatusChang
             return ServiceResponse.success();
         }
 
-        if (!ContentMallShopType.WEIMO_MALL.getCode().equals(response.getResult().getMallShopType())) {
-            log.info("当前企业内容配置非微盟商城 {}", JSON.toJSONString(response));
+        if (!ContentMallShopType.WEIMO_MALL.getCode().equals(response.getResult().getMallShopType())
+                && !ContentMallShopType.THIRD_MALL.getCode().equals(response.getResult().getMallShopType())) {
+            log.info("当前企业内容配置非微盟/自研商城 {}", JSON.toJSONString(response));
             return ServiceResponse.success();
         }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/util/OrderCheckUtil.java

+package com.gic.haoban.manage.service.util;
+
+import com.gic.enterprise.api.enums.PlatformChannelEnum;
+import com.gic.orderecommerce.api.constant.OrderChannelEnum;
+import com.google.common.collect.Lists;
+
+import java.util.List;
+
+public class OrderCheckUtil {
+
+    private static final List<Integer> DEAL_ORDER_TYPE_LIST = Lists.newArrayList(
+            OrderChannelEnum.WEIMOB.getSort(),
+            OrderChannelEnum.BRAND_MALL.getSort());
+
+    /**
+     * 销售线索是否需要处理订单类型
+     * @param orderType
+     * @return
+     */
+    public static boolean checkOrderType(Integer orderType) {
+        return DEAL_ORDER_TYPE_LIST.contains(orderType);
+    }
+
+}
\ No newline at end of file