fix:加好友逻辑修改

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/constants/Manage3Constants.java

@@ -9,4 +9,13 @@ public class Manage3Constants {
      * 企业微信报错日志消息路由
      */
     public static final String QYWX_ERROR_MSG = "addQywxErrorLogMq";
+
+    /**
+     * 活码前缀
+     */
+    public static final String HM = "HM";
+    /**
+     * 链接前缀
+     */
+    public static final String DT = "DT";
 }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmQrcodeApiService.java

@@ -55,7 +55,17 @@ public interface HmQrcodeApiService {
      * @author mozhu
      * @date 2022-07-05 10:59:03
      */
-    HmQrcodeDTO queryById(Long hmId);
+    HmQrcodeDTO getDetailById(Long hmId);
+
+    /**
+     * 查询详情简单
+     *
+     * @param hmId hm id
+     * @return {@link HmQrcodeDTO }
+     * @author mozhu
+     * @date 2022-07-15 16:32:10
+     */
+    HmQrcodeDTO getSimpleById(Long hmId);
 
 
     /**
@@ -142,4 +152,28 @@ public interface HmQrcodeApiService {
      * @return
      */
     ServiceResponse<Boolean> batchUpdateHmQrcodeGroup(List<Long> hmIds, Long groupId);
+
+
+    /**
+     * 根据活码id和导购id查询数据
+     *
+     * @param hmId    hm id
+     * @param clerkId 职员id
+     * @return {@link HmClerkRelationDTO }
+     * @author mozhu
+     * @date 2022-07-15 16:36:29
+     */
+    HmClerkRelationDTO getHmClerkByHmIdAndClerkId(Long hmId,String clerkId);
+
+
+    /**
+     * 根据活码id随机找一个
+     *
+     * @param hmId hm id
+     * @return {@link HmClerkRelationDTO }
+     * @author mozhu
+     * @date 2022-07-15 16:48:42
+     */
+    HmClerkRelationDTO getOneHmClerkByHmId(Long hmId);
+
 }

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

@@ -14,7 +14,6 @@ import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.*;
-import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogQDTO;
 import com.gic.haoban.manage.api.enums.AlertTypeEnum;
 import com.gic.haoban.manage.api.service.CheckQywxSettingApiService;
 import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
@@ -214,21 +213,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         //回调给会员，更新是否为企微好友
         log.info("通知会员 合并会员后更新为企微好友,memberId:{}", memberId);
         memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
-
-        if (StringUtils.isNotBlank(memberId)) {
-            //添加日志
-            WxUserAddLogQDTO wxUserAddLogQDTO = new WxUserAddLogQDTO();
-            wxUserAddLogQDTO.setWxEnterpriseId(wxEnterpriseId);
-            wxUserAddLogQDTO.setEnterpriseId(enterpriseId);
-            wxUserAddLogQDTO.setMemberId(memberId);
-            wxUserAddLogQDTO.setUnionid(unionid);
-            wxUserAddLogQDTO.setDelFlag(false);
-            wxUserAddLogQDTO.setExternalUserid(externalClerkRelated.getExternalUserId());
-            wxUserAddLogQDTO.setWxUserId(externalClerkRelated.getWxUserId());
-            wxUserAddLogQDTO.setStaffId(externalClerkRelated.getStaffId());
-            wxUserAddLogService.save(wxUserAddLogQDTO);
-        }
-
+        //日志
+        wxUserAddLogService.updateMemberInfo(wxEnterpriseId, enterpriseId, externalClerkRelated.getStaffId(), externalClerkRelated.getExternalUserId(), memberId);
     }
 
     /**

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

@@ -32,6 +32,8 @@ import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.constants.Manage3Constants;
 import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.hm.HmClerkRelationDTO;
+import com.gic.haoban.manage.api.dto.hm.HmQrcodeDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogQDTO;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
 import com.gic.haoban.manage.api.enums.WelcomeMediaTypeEnum;
@@ -62,6 +64,8 @@ import com.gic.member.api.dto.MemberDTO;
 import com.gic.member.api.service.MemberApiService;
 import com.gic.member.api.service.MemberOpenCardBusinessService;
 import com.gic.member.api.service.MemberStoreService;
+import com.gic.member.tag.api.dto.outapi.MemberTagSingleDTO;
+import com.gic.member.tag.api.service.MemberTagOpenApiService;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.dto.qywx.*;
@@ -157,6 +161,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     private WxUserAddLogService wxUserAddLogService;
     @Autowired
     private KeyDataService keyDataService;
+    @Autowired
+    private MemberTagOpenApiService memberTagOpenApiService;
 
     @Override
     public void dealQywxExternalUser(String params) {
@@ -323,22 +329,71 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String staffWxUserId = staff.getWxUserId();
         log.info("新增外部联系人,staff.getWxUserId():{}", staffWxUserId);
         dto.setWxUserId(staffWxUserId);
-        TabHaobanClerkMainStoreRelated mainStoreRelated = clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId);
-        if (mainStoreRelated == null) {
-            log.info("【新增外部联系人】主门店为空:{}", staffId);
-            // 无主门店仅发送欢迎语
-            sendWelcome(dto, wxEnterpriseId, null, staffId, null);
-            return;
-        }
+        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);
+                if (hmQrcodeDTO == null) {
+                    log.error("活码为空：{}", refId);
+                    return;
+                }
+                wxUserAddLogQDTO.setHmId(refId);
+                hmQrcodeApiService.updateAddNumById(refId, hmQrcodeDTO.getClerkId());
+                //处理活码导购
+                if (hmQrcodeDTO.getHmType() == 1) {
+                    staffClerkRelationDTO = staffClerkRelationService.getBindByClerkId(hmQrcodeDTO.getClerkId(), wxEnterpriseId);
+                } else if (hmQrcodeDTO.getHmType() == 2) {
+                    HmClerkRelationDTO hmClerkRelationDTO = null;
+                    TabHaobanClerkMainStoreRelated mainStoreRelated = clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId);
+                    if (mainStoreRelated != null) {
+                        StaffClerkRelationDTO relationDTO = staffClerkRelationService.getOneBindByStoreId(staffId, mainStoreRelated.getStoreId());
+                         hmClerkRelationDTO = hmQrcodeApiService.getHmClerkByHmIdAndClerkId(refId, relationDTO.getClerkId());
+                        if (hmClerkRelationDTO == null) {
+                            hmClerkRelationDTO = hmQrcodeApiService.getOneHmClerkByHmId(refId);
+                        }
+                    }  else {
+                         hmClerkRelationDTO = hmQrcodeApiService.getOneHmClerkByHmId(refId);
+                    }
+                    staffClerkRelationDTO = staffClerkRelationService.getBindByClerkId(hmClerkRelationDTO.getClerkId(), wxEnterpriseId);
+                }
+            } else if (state.contains(Manage3Constants.DT)) {
+                KeyDataLinkBO dataForHmLink = keyDataService.getDataForHmLink(id);
+                refId = dataForHmLink.getLinkId();
+                unionid = dataForHmLink.getUnionid();
+                Long hmId = dataForHmLink.getHmId();
+                wxUserAddLogQDTO.setLinkId(refId);
+                wxUserAddLogQDTO.setHmId(hmId);
 
-        StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getOneBindByStoreId(staffId, mainStoreRelated.getStoreId());
-        if (staffClerkRelationDTO == null) {
-            log.info("【新增外部联系人】导购和clerk关联为空");
-            return;
-        }
+                hmQrcodeDTO = hmQrcodeApiService.getSimpleById(refId);
+                if (hmQrcodeDTO == null) {
+                    log.error("活码动态为空：{}", refId);
+                    return;
+                }
+                staffClerkRelationDTO = staffClerkRelationService.getBindByClerkId(hmQrcodeDTO.getClerkId(), wxEnterpriseId);
+            }
+        } else {
+            TabHaobanClerkMainStoreRelated mainStoreRelated = clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId);
+            if (mainStoreRelated == null) {
+                log.info("【新增外部联系人】主门店为空:{}", staffId);
+                // 无主门店仅发送欢迎语
+                sendWelcome(dto, wxEnterpriseId, null, staffId, null);
+                return;
+            }
 
+            staffClerkRelationDTO = staffClerkRelationService.getOneBindByStoreId(staffId, mainStoreRelated.getStoreId());
+            if (staffClerkRelationDTO == null) {
+                log.info("【新增外部联系人】导购和clerk关联为空");
+                return;
+            }
+        }
         String enterpriseId = staffClerkRelationDTO.getEnterpriseId();
-        String clerkId = staffClerkRelationDTO.getClerkId();
         TabHaobanWxEnterpriseRelated wxEnterpriseRelated = wxEnterpriseRelatedService.getByEnterpriseId(wxEnterpriseId, enterpriseId);
         if (wxEnterpriseRelated == null) {
             log.info("没有存在企业关联：{},{}", staffClerkRelationDTO.getWxEnterpriseId(), enterpriseId);
@@ -351,28 +406,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             return;
         }
 
-        //活码处理 "DT" "HM"
-        Long refId = 0L;
-        WxUserAddLogQDTO wxUserAddLogQDTO = new WxUserAddLogQDTO();
-        if (StringUtils.isNotBlank(state) && StringUtils.isNotBlank(clerkId)) {
-            String id = state.substring(2);
-            if (state.contains("HM")) {
-                //活码
-                refId = Convert.toLong(id);
-                wxUserAddLogQDTO.setHmId(refId);
-                hmQrcodeApiService.updateAddNumById(Convert.toLong(id),clerkId);
-            } else if (state.contains("DT")) {
-                KeyDataLinkBO dataForHmLink = keyDataService.getDataForHmLink(id);
-                refId = dataForHmLink.getLinkId();
-                unionid = dataForHmLink.getUnionid();
-                wxUserAddLogQDTO.setLinkId(refId);
-                wxUserAddLogQDTO.setHmId(dataForHmLink.getHmId());
-            }
-        }
-
         String memberId = "";
         if (StringUtils.isNotBlank(unionid)) {
-            log.info("有unionid处理：wxEnterpriseId:{}，unionid：{}", wxEnterpriseId,unionid);
+            log.info("有unionid处理：wxEnterpriseId:{}，unionid：{}", wxEnterpriseId, unionid);
             dto.setUnionid(unionid);
             memberId = addExternalClerkRelated(dto, staffId, staffClerkRelationDTO, wxEnterpriseRelated);
         } else {
@@ -380,8 +416,38 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             addFriendByWelcome(dto, staffClerkRelationDTO);
         }
 
+        if (StringUtils.isNotBlank(memberId) && hmQrcodeDTO != null) {
+            setMemberTag(staffClerkRelationDTO, hmQrcodeDTO,memberId);
+        }
+
         log.info("插入加好友日志");
-        wxUserAddLogService.updateMemberInfo(wxEnterpriseId,enterpriseId,staffId,externalUserId,memberId);
+        wxUserAddLogQDTO.setWxEnterpriseId(wxEnterpriseId);
+        wxUserAddLogQDTO.setEnterpriseId(enterpriseId);
+        wxUserAddLogQDTO.setMemberId(memberId);
+        wxUserAddLogQDTO.setUnionid(unionid);
+        wxUserAddLogQDTO.setDelFlag(false);
+        wxUserAddLogQDTO.setExternalUserid(externalUserId);
+        wxUserAddLogQDTO.setWxUserId(wxUserId);
+        wxUserAddLogQDTO.setStaffId(staffId);
+        wxUserAddLogService.save(wxUserAddLogQDTO);
+    }
+
+    /**
+     * 设置活码标签
+     * @param staffClerkRelationDTO
+     * @param hmQrcodeDTO
+     * @param memberId
+     */
+    private void setMemberTag(StaffClerkRelationDTO staffClerkRelationDTO, HmQrcodeDTO hmQrcodeDTO,String memberId) {
+        String memberLabelId = hmQrcodeDTO.getMemberLabelId();
+        if (StringUtils.isNotBlank(memberLabelId)) {
+            MemberTagSingleDTO tagSingleDTO = new MemberTagSingleDTO();
+            tagSingleDTO.setEnterpriseId(staffClerkRelationDTO.getEnterpriseId());
+            tagSingleDTO.setOptType(0);
+            tagSingleDTO.setMemberId(memberId);
+            tagSingleDTO.setTagItemIdList(Collections.singletonList(memberLabelId));
+            this.memberTagOpenApiService.saveMemberTagSingle(tagSingleDTO);
+        }
     }
 
     /**
@@ -634,16 +700,17 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
     /**
      * 获取链接或者活码id
+     *
      * @param state
      * @return
      */
-    private WelcomeReferBO getWelcomeReferBo(String state){
+    private WelcomeReferBO getWelcomeReferBo(String state) {
         WelcomeReferBO welcomeReferBo = new WelcomeReferBO();
         String id = state.substring(2);
-        if (state.contains("HM")) {
+        if (state.contains(Manage3Constants.HM)) {
             welcomeReferBo.setType(HmWelcomeReferType.HM.getCode());
             welcomeReferBo.setReferId(id);
-        } else if (state.contains("DT")) {
+        } else if (state.contains(Manage3Constants.DT)) {
             KeyDataLinkBO dataForHmLink = keyDataService.getDataForHmLink(id);
             if (dataForHmLink != null) {
                 welcomeReferBo.setType(HmWelcomeReferType.LINK.getCode());

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

@@ -441,7 +441,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
 
 
     @Override
-    public HmQrcodeDTO queryById(Long hmId) {
+    public HmQrcodeDTO getDetailById(Long hmId) {
         HmQrcodeBO hmQrcodeBO = hmQrcodeService.queryById(hmId);
         if (hmQrcodeBO != null) {
             HmGroupSettingBO hmGroupSettingBO = hmGroupService.queryGroupSettingDetail(hmQrcodeBO.getHmGroupId());
@@ -477,6 +477,11 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         return EntityUtil.changeEntityNew(HmQrcodeDTO.class, hmQrcodeBO);
     }
 
+    @Override
+    public HmQrcodeDTO getSimpleById(Long hmId) {
+        return EntityUtil.changeEntityNew(HmQrcodeDTO.class, hmQrcodeService.queryById(hmId));
+    }
+
     @GicLogRecord(value = "废弃员工活码-${#logContent}",
             category = GicLogRecordCategoryEnum.HUOMA,
             optType = GicLogRecordOptTypeEnum.HUOMA_DEL,
@@ -658,4 +663,15 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         int updateCount = hmQrcodeService.batchUpdateQrcodeGroup(hmIds, groupId);
         return ServiceResponse.success(updateCount > 0);
     }
+
+    @Override
+    public HmClerkRelationDTO getHmClerkByHmIdAndClerkId(Long hmId, String clerkId) {
+        return EntityUtil.changeEntityNew(HmClerkRelationDTO.class,hmClerkRelationService.queryByHmIdAndClerkId(hmId, clerkId));
+    }
+
+    @Override
+    public HmClerkRelationDTO getOneHmClerkByHmId(Long hmId) {
+        HmClerkRelationBO hmClerkRelationBO = hmClerkRelationService.getHmClerkByHmId(hmId).get(0);
+        return EntityUtil.changeEntityNew(HmClerkRelationDTO.class,hmClerkRelationBO);
+    }
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmQrcodeController.java

@@ -181,7 +181,7 @@ public class HmQrcodeController {
      */
     @RequestMapping(value = "detail", method = RequestMethod.GET)
     public RestResponse detail(Long hmId) {
-        HmQrcodeDTO hmQrcodeDTO = this.hmQrcodeApiService.queryById(hmId);
+        HmQrcodeDTO hmQrcodeDTO = this.hmQrcodeApiService.getDetailById(hmId);
         return RestResponse.successResult(hmQrcodeDTO);
     }
 
@@ -235,7 +235,7 @@ public class HmQrcodeController {
     @RequestMapping(value = "detail-clerk-list", method = RequestMethod.POST)
     public RestResponse detailClerkList(@RequestBody HmQrcodeDetailQO hmQrcodeDetailQO) {
         Long hmId = hmQrcodeDetailQO.getHmId();
-        HmQrcodeDTO hmQrcodeDTO = hmQrcodeApiService.queryById(hmId);
+        HmQrcodeDTO hmQrcodeDTO = hmQrcodeApiService.getDetailById(hmId);
         if (hmQrcodeDTO == null) {
             return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_8.getCode()),HaoBanErrCode.ERR_8.getMsg());
         }
@@ -267,7 +267,7 @@ public class HmQrcodeController {
     public RestResponse detailClerkListPage(@RequestBody HmDetailClerkListQO hmDetailClerkListQO) {
         hmDetailClerkListQO.getInFields().setEnterpriseId(AuthWebRequestUtil.getLoginUser().getEnterpriseId());
         Long hmId = hmDetailClerkListQO.getInFields().getHmId();
-        HmQrcodeDTO hmQrcodeDTO = hmQrcodeApiService.queryById(hmId);
+        HmQrcodeDTO hmQrcodeDTO = hmQrcodeApiService.getDetailById(hmId);
         if (hmQrcodeDTO == null) {
             return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_8.getCode()),HaoBanErrCode.ERR_8.getMsg());
         }