活码unionid

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

@@ -314,6 +314,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String externalUserId = dto.getExternalUserid();
         String unionid = dto.getUnionid();
         String state = dto.getState();
+        boolean isHmUnionid = false ;
         log.info("新增外部联系人,wxEnterpriseId:{}", wxEnterpriseId);
         if (StringUtils.isAnyBlank(wxUserId, wxEnterpriseId, name, createTime, externalUserId)) {
             log.error("新增外部联系人，缺少必须字段：wxUserId:{},wxEnterpriseId:{},name:{},createTime:{},externalUserId:{}", wxUserId, wxEnterpriseId, name, createTime, externalUserId);
@@ -331,21 +332,20 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         dto.setWxUserId(staffWxUserId);
         StaffClerkRelationDTO staffClerkRelationDTO = null;
         //活码处理 "DT" "HM"
-        Long refId = 0L;
         WxUserAddLogQDTO wxUserAddLogQDTO = new WxUserAddLogQDTO();
         HmQrcodeDTO hmQrcodeDTO = null;
         if (StringUtils.isNotBlank(state)) {
             String id = state.substring(2);
             if (state.contains(Manage3Constants.HM)) {
-                //活码
-                refId = Convert.toLong(id);
-                hmQrcodeDTO = hmQrcodeApiService.getSimpleById(refId);
+                Long hmId = Convert.toLong(id);
+                log.info("普通活码={}",hmId);
+                hmQrcodeDTO = hmQrcodeApiService.getSimpleById(hmId);
                 if (hmQrcodeDTO == null) {
-                    log.error("活码为空：{}", refId);
+                    log.error("活码为空：{}", hmId);
                     return;
                 }
-                wxUserAddLogQDTO.setHmId(refId);
-                hmQrcodeApiService.updateAddNumById(refId, hmQrcodeDTO.getClerkId());
+                wxUserAddLogQDTO.setHmId(hmId);
+                hmQrcodeApiService.updateAddNumById(hmId, hmQrcodeDTO.getClerkId());
                 //处理活码导购
                 if (hmQrcodeDTO.getHmType() == 1) {
                     staffClerkRelationDTO = staffClerkRelationService.getBindByClerkId(hmQrcodeDTO.getClerkId(), wxEnterpriseId);
@@ -355,26 +355,27 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                     TabHaobanClerkMainStoreRelated mainStoreRelated = clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId);
                     if (mainStoreRelated != null) {
                         StaffClerkRelationDTO relationDTO = staffClerkRelationService.getOneBindByStoreId(staffId, mainStoreRelated.getStoreId());
-                         hmClerkRelationDTO = hmQrcodeApiService.getHmClerkByHmIdAndClerkId(refId, relationDTO.getClerkId());
+                         hmClerkRelationDTO = hmQrcodeApiService.getHmClerkByHmIdAndClerkId(hmId, relationDTO.getClerkId());
                         if (hmClerkRelationDTO == null) {
-                            hmClerkRelationDTO = hmQrcodeApiService.getOneHmClerkByHmIdAndStaffId(refId, staffId);
+                            hmClerkRelationDTO = hmQrcodeApiService.getOneHmClerkByHmIdAndStaffId(hmId, staffId);
                             if (hmClerkRelationDTO == null) {
-                                hmClerkRelationDTO = hmQrcodeApiService.getOneHmClerkByHmId(refId);
+                                hmClerkRelationDTO = hmQrcodeApiService.getOneHmClerkByHmId(hmId);
                             }
                         }
                     }  else {
-                         hmClerkRelationDTO = hmQrcodeApiService.getOneHmClerkByHmId(refId);
+                         hmClerkRelationDTO = hmQrcodeApiService.getOneHmClerkByHmId(hmId);
                     }
                     staffClerkRelationDTO = staffClerkRelationService.getBindByClerkId(hmClerkRelationDTO.getClerkId(), wxEnterpriseId);
                 }
             } else if (state.contains(Manage3Constants.DT)) {
                 KeyDataLinkBO dataForHmLink = keyDataService.getDataForHmLink(id);
-                refId = dataForHmLink.getLinkId();
-                unionid = dataForHmLink.getUnionid();
+                Long linkId = dataForHmLink.getLinkId();
                 Long hmId = dataForHmLink.getHmId();
-                wxUserAddLogQDTO.setLinkId(refId);
+                unionid = dataForHmLink.getUnionid();
+                log.info("动态活码hmId={},linkId={},unionid={}",hmId,linkId,unionid);
+                isHmUnionid = true ;
+                wxUserAddLogQDTO.setLinkId(linkId);
                 wxUserAddLogQDTO.setHmId(hmId);
-
                 hmQrcodeDTO = hmQrcodeApiService.getSimpleById(hmId);
                 if (hmQrcodeDTO == null) {
                     log.error("活码动态为空：{}", hmId);
@@ -414,7 +415,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         if (StringUtils.isNotBlank(unionid)) {
             log.info("有unionid处理：wxEnterpriseId:{}，unionid：{}", wxEnterpriseId, unionid);
             dto.setUnionid(unionid);
-            memberId = addExternalClerkRelated(dto, staffId, staffClerkRelationDTO, wxEnterpriseRelated);
+            memberId = addExternalClerkRelated(dto, staffId, staffClerkRelationDTO, wxEnterpriseRelated,isHmUnionid);
         } else {
             log.info("发送欢迎语逻辑：wxEnterpriseId:{}", wxEnterpriseId);
             addFriendByWelcome(dto, staffClerkRelationDTO);
@@ -462,14 +463,14 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      * @param staffClerkRelationDTO
      * @param wxEnterpriseRelated
      */
-    private String addExternalClerkRelated(MemberUnionidRelatedDTO dto, String staffId, StaffClerkRelationDTO staffClerkRelationDTO, TabHaobanWxEnterpriseRelated wxEnterpriseRelated) {
+    private String addExternalClerkRelated(MemberUnionidRelatedDTO dto, String staffId, StaffClerkRelationDTO staffClerkRelationDTO, TabHaobanWxEnterpriseRelated wxEnterpriseRelated , boolean isHmUnionid) {
         String wxUserId = dto.getWxUserId();
         String wxEnterpriseId = dto.getWxEnterpriseId();
         String name = dto.getExternalName();
         String createTime = dto.getAddCreateTime();
         String externalUserid = dto.getExternalUserid();
         String avatar = dto.getAvatar();
-        if (wxEnterpriseRelated.getMemberOpenCardFlag() == 1) {
+        if (wxEnterpriseRelated.getMemberOpenCardFlag() == 1 && (!isHmUnionid)) {
             log.info("不同开平，走欢迎语逻辑，wxEnterpriseId：{}", wxEnterpriseId);
             addFriendByWelcome(dto, staffClerkRelationDTO);
             return "";