登录增加导购手机号

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

@@ -33,6 +33,8 @@ import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmLinkSearchQDTO;
 import com.gic.haoban.manage.api.service.hm.HmLinkApiService;
 import com.gic.haoban.manage.service.config.Config;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
+import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
 import com.gic.haoban.manage.service.errorcode.HaoBanErrCode;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmLinkBO;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmPageBO;
@@ -84,6 +86,8 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
     private HmPageService hmPageService;
     @Autowired
     private HmQrcodeTempService hmQrcodeTempService;
+    @Autowired
+    private TabHaobanExternalClerkRelatedMapper tabHaobanExternalClerkRelatedMapper;
 
     @Override
     public ServiceResponse<String> getHmLinkUrl() {
@@ -222,7 +226,6 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                         memberId = mobileMemberId;
                     }
                 }
-                System.out.println("");
                 log.info("小程序获取活码memberId={}", memberId);
                 if (StringUtils.isNotBlank(memberId)) {
                     MemberDataDTO member = this.getMemberClerk(enterpriseId, memberId);
@@ -240,6 +243,8 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                     // 协管门店
                     List<MemberStoreClerkDataDTO> list = member.getStoreClerkRel();
                     if (null == hm && null != xgStore && CollectionUtils.isNotEmpty(list)) {
+                        // 排序协管导购
+                        list = this.sortMemberClerk(list);
                         List<String> storeIdList = new ArrayList<>();
                         // 协管导购
                         for (MemberStoreClerkDataDTO item : list) {
@@ -298,17 +303,32 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
             }
         }
         if (null != hm) {
-            KeyDataLinkBO bo = new KeyDataLinkBO();
-            bo.setUnionid(unionid);
-            bo.setLinkId(linkId);
-            bo.setHmId(hm.getHmId());
-            String dthmKey = this.keyDataService.saveDataForLink(enterpriseId, bo);
-            if (null != dthmKey) {
-                ServiceResponse<String> addResp = this.addQrcode(hm, dthmKey, wxEnterpriseDTO.getCorpid(), retDTO);
-                if (!addResp.isSuccess()) {
+            // 判断是否已经是好友
+            boolean isFriend = false;
+            if (null != memberId) {
+                String staffId = hm.getStaffId();
+                TabHaobanExternalClerkRelated friend = tabHaobanExternalClerkRelatedMapper
+                        .getByMemberIdAndStaffId(staffId, enterpriseId, memberId);
+                if (null != friend) {
+                    isFriend = true;
+                    log.info("已经是好友,staffid={},memberId={}", staffId, memberId);
                     retDTO.setHmQrcode(hm.getWxQrcode());
-                }else {
-                    retDTO.setHmQrcode(addResp.getResult());
+                }
+            }
+
+            if (!isFriend) {
+                KeyDataLinkBO bo = new KeyDataLinkBO();
+                bo.setUnionid(unionid);
+                bo.setLinkId(linkId);
+                bo.setHmId(hm.getHmId());
+                String dthmKey = this.keyDataService.saveDataForLink(enterpriseId, bo);
+                if (null != dthmKey) {
+                    ServiceResponse<String> addResp = this.addQrcode(hm, dthmKey, wxEnterpriseDTO.getCorpid(), retDTO);
+                    if (!addResp.isSuccess()) {
+                        retDTO.setHmQrcode(hm.getWxQrcode());
+                    } else {
+                        retDTO.setHmQrcode(addResp.getResult());
+                    }
                 }
             }
             // 查询页面
@@ -322,10 +342,25 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
         return ServiceResponse.success(retDTO);
     }
 
+    private List<MemberStoreClerkDataDTO> sortMemberClerk(List<MemberStoreClerkDataDTO> list) {
+        List<MemberStoreClerkDataDTO> retList = new ArrayList<>();
+        List<String> mainClerkIdList = new ArrayList<>();
+        List<MemberStoreClerkDataDTO> notMainClerkList = new ArrayList<>();
+        for (MemberStoreClerkDataDTO item : retList) {
+            if (mainClerkIdList.contains(item.getClerkIdRel())) {
+                retList.add(item);
+            } else {
+                notMainClerkList.add(item);
+            }
+        }
+        retList.addAll(notMainClerkList);
+        return retList;
+    }
+
     // 创建活码
     private ServiceResponse<String> addQrcode(HmQrcodeBO hm, String key, String corpid, HmLinkWxaDTO retDTO) {
-        String limitQrcode = this.limitIp(hm) ;
-        if(StringUtils.isNotEmpty(limitQrcode)) {
+        String limitQrcode = this.limitIp(hm);
+        if (StringUtils.isNotEmpty(limitQrcode)) {
             return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "超限制数");
         }
         QywxExternalcontactDTO paramsDTO = new QywxExternalcontactDTO();
@@ -352,21 +387,20 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
         }
         return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "企微错误：" + dto.getErrmsg());
     }
-    
-    
+
     private String limitIp(HmQrcodeBO hm) {
-        String ipKey = "hmadd:limit:ip" ;
+        String ipKey = "hmadd:limit:ip";
         int ipLimitCount = 1;
         RRateLimiter rateLimiter = RedisUtil.getRedisClient().getRateLimiter(ipKey);
         rateLimiter.trySetRate(RateType.OVERALL, ipLimitCount, 1, RateIntervalUnit.SECONDS);
-        if(rateLimiter.tryAcquire()) {
-            return null ; 
+        if (rateLimiter.tryAcquire()) {
+            return null;
         }
         String msg = "活码调用次数告警【ip】";
         DingUtils.send(msg, false);
-        return hm.getWxQrcode() ;
+        return hm.getWxQrcode();
     }
-    
+
     private HmQrcodeBO getHmFromClerk(String clerkId, String wxEnterpriseId) {
         if (StringUtils.isBlank(clerkId) || "-1".equals(clerkId)) {
             return null;

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

@@ -474,6 +474,7 @@ public class LoginController extends WebBaseController {
         loginUser.setRoleId(roleId);
         loginUser.setDepartAuth(clerk.getDepartAuth());
         loginUser.setBrandName(enterprise.getBrandName());
+        loginUser.setClerkPhone(clerk.getPhoneNumber()) ;
         AuthWebRequestUtil.setSessionUser(loginUser);
         AuthWebRequestUtil.setAppLoginUser(token, loginUser);
         boolean flag = wxEnterpriseApiService.enterpriseIsOver(enterpriseId);

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

@@ -570,6 +570,7 @@ public class HmLinkController {
             MemberTagItemDTO tag = this.memberTagApiService.findMemberTagItem(memberLabelId);
             if (null != tag) {
                 linkVO.setMemberLabelName(tag.getTagName() + "-" + tag.getTagItemName());
+                linkVO.setMemberLabelStatus(tag.getStatus());
             }
         }
         ServiceResponse<String> urlResp = this.hmLinkApiService.getHmLinkUrl();

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/HmLinkVO.java

@@ -41,12 +41,21 @@ public class HmLinkVO implements Serializable {
     /**会员活动标签*/
     private String memberLabelId;
     private String memberLabelName;
+    private Integer memberLabelStatus ;
     /**0删除 1正常*/
     private Integer statusFlag;
     private String shortCode;
     private String linkUrl;
     private List<HmLinkStoreVO> storeList;
 
+    public Integer getMemberLabelStatus() {
+        return memberLabelStatus;
+    }
+
+    public void setMemberLabelStatus(Integer memberLabelStatus) {
+        this.memberLabelStatus = memberLabelStatus;
+    }
+
     public String getMemberLabelName() {
         return memberLabelName;
     }