会员合并

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

@@ -151,8 +151,10 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
         dto.setMergeMemberId(memberId);
         dto.setEnterpriseId(enterpriseId);
         dto.setOpt(2);
+        JSONObject msg = JSONObject.parseObject(JSON.toJSONString(dto)) ;
+        msg.put("eventFlag",1) ;
         try {
-            GICMQClientUtil.getClientInstance().sendMessage("memberIdChangeNotify", JSON.toJSONString(dto));
+            GICMQClientUtil.getClientInstance().sendMessage("memberIdChangeNotify", msg.toJSONString());
         } catch (Exception ex) {
             throw new RuntimeException(ex);
         }

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

 package com.gic.haoban.manage.service.service.out.impl.content;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.qdto.content.InteractRecordQDTO;
@@ -12,6 +13,7 @@ import com.gic.haoban.manage.service.pojo.bo.content.MemberAttrChangeBO;
 import com.gic.haoban.manage.service.pojo.qo.content.InteractRecordQO;
 import com.gic.haoban.manage.service.service.content.InteractRecordService;
 import com.gic.haoban.manage.service.service.content.PotentialCustomerService;
+import com.gic.haoban.manage.service.util.EventUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -97,6 +99,19 @@ public class InteractRecordApiServiceImpl implements InteractRecordApiService {
             log.info("会员id发生变化 {}", params);
             return ServiceResponse.success();
         }
+        JSONObject jsonObject = JSONObject.parseObject(params);
+        int eventFlag = jsonObject.getIntValue("eventFlag") ;
+        if(EventUtils.isOpenEvent()) {
+            if(eventFlag == 0) {
+                log.info("非事件入口,不处理");
+                return ServiceResponse.success();
+            }
+        }else {
+            if(eventFlag == 1) {
+                log.info("事件入口,不处理");
+                return ServiceResponse.success();
+            }
+        }
         MemberAttrChangeBO memberAttrChangeBO = JSON.parseObject(params, MemberAttrChangeBO.class);
         if (memberAttrChangeBO == null) {
             return ServiceResponse.success();