加好友查询会员修改

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

@@ -65,6 +65,7 @@ import com.gic.haoban.manage.service.util.EmojiFilterUtil;
 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.MemberService;
 import com.gic.member.api.service.MemberStoreService;
 import com.gic.member.tag.api.dto.outapi.MemberTagSingleDTO;
 import com.gic.member.tag.api.service.MemberTagOpenApiService;
@@ -167,6 +168,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     private MemberTagOpenApiService memberTagOpenApiService;
     @Autowired
     private HmLinkService hmLinkService;
+    @Autowired
+    private MemberService memberService;
 
     @Override
     public void dealQywxExternalUser(String params) {
@@ -319,6 +322,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String unionid = dto.getUnionid();
         String state = dto.getState();
         boolean isHmUnionid = false;
+        String mobile = "";
         log.info("新增外部联系人,wxEnterpriseId:{}", wxEnterpriseId);
         if (StringUtils.isAnyBlank(wxUserId, wxEnterpriseId, name, createTime, externalUserId)) {
             log.error("新增外部联系人，缺少必须字段：wxUserId:{},wxEnterpriseId:{},name:{},createTime:{},externalUserId:{}", wxUserId, wxEnterpriseId, name, createTime, externalUserId);
@@ -382,6 +386,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 KeyDataLinkBO dataForHmLink = keyDataService.getDataForHmLink(id);
                 Long linkId = dataForHmLink.getLinkId();
                 Long hmId = dataForHmLink.getHmId();
+                mobile = dataForHmLink.getMobile();
                 unionid = dataForHmLink.getUnionid();
                 log.info("动态活码hmId={},linkId={},unionid={}", hmId, linkId, unionid);
                 isHmUnionid = true;
@@ -423,7 +428,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, isHmUnionid);
+            memberId = addExternalClerkRelated(dto, staffId, staffClerkRelationDTO, wxEnterpriseRelated, isHmUnionid, mobile);
         } else {
             log.info("发送欢迎语逻辑：wxEnterpriseId:{}", wxEnterpriseId);
             addFriendByWelcome(dto, staffClerkRelationDTO);
@@ -455,7 +460,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      * @param memberId
      */
     private void setMemberTag(StaffClerkRelationDTO staffClerkRelationDTO, String memberLabelId, String memberId) {
-        log.info("会员打标签,memberLabelId:{},memberId:{}",memberLabelId,memberId);
+        log.info("会员打标签,memberLabelId:{},memberId:{}", memberLabelId, memberId);
         if (StringUtils.isNotBlank(memberLabelId)) {
             MemberTagSingleDTO tagSingleDTO = new MemberTagSingleDTO();
             tagSingleDTO.setEnterpriseId(staffClerkRelationDTO.getEnterpriseId());
@@ -474,7 +479,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      * @param staffClerkRelationDTO
      * @param wxEnterpriseRelated
      */
-    private String addExternalClerkRelated(MemberUnionidRelatedDTO dto, String staffId, StaffClerkRelationDTO staffClerkRelationDTO, TabHaobanWxEnterpriseRelated wxEnterpriseRelated, boolean isHmUnionid) {
+    private String addExternalClerkRelated(MemberUnionidRelatedDTO dto, String staffId, StaffClerkRelationDTO staffClerkRelationDTO,
+                                           TabHaobanWxEnterpriseRelated wxEnterpriseRelated, boolean isHmUnionid, String mobile) {
         String wxUserId = dto.getWxUserId();
         String wxEnterpriseId = dto.getWxEnterpriseId();
         String name = dto.getExternalName();
@@ -515,12 +521,25 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             log.info("不能生产导购二维码：{}", JSONObject.toJSONString(clerk));
             return "";
         }
-        log.info("【新增外部联系人会员】enterpriseId={},unionId={},name={},avatar={},QrcodeParam={}", enterpriseId, unionId, name, avatar, qrcodeParam);
-        MemberDTO member = memberOpenCardBusinessService.getMemberByQywxChannelParam(enterpriseId, unionId, "", name, avatar, qrcodeParam);
+
+        MemberDTO member = null;
+        if (isHmUnionid) {
+            log.info("根据手机号查询会员：{},{}", enterpriseId, mobile);
+            if (StringUtils.isNotBlank(mobile)) {
+                member = memberService.getMemberByPhone(enterpriseId, mobile);
+            }
+        }
+
         if (member == null) {
-            log.info("生产会员memnerid失败：{}", unionId);
+            log.info("【新增外部联系人会员】enterpriseId={},unionId={},name={},avatar={},QrcodeParam={}", enterpriseId, unionId, name, avatar, qrcodeParam);
+            member = memberOpenCardBusinessService.getMemberByQywxChannelParam(enterpriseId, unionId, "", name, avatar, qrcodeParam);
+        }
+
+        if (member == null) {
+            log.info("生产会员memberid失败：{}", unionId);
             return "";
         }
+
         String memberId = member.getMemberId();
         List<TabHaobanExternalClerkRelated> externalClerkRelateds = externalClerkRelatedService.listByExTernalUseridAndWxUserIdAllStatus(wxEnterpriseId, externalUserid, dto.getWxUserId());
         String relationKey = SecureUtil.md5(staffId + externalUserid);

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

@@ -636,6 +636,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
 
     @Override
     public int updateAddNumById(Long hmId, String clerkId) {
+
         HmQrcodeBO hmQrcodeBO = hmQrcodeService.queryById(hmId);
         if (hmQrcodeBO == null) {
             logger.error("无活码数据");

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

@@ -327,7 +327,7 @@ public class MaidianDataController extends WebBaseController {
         }
         if (StringUtils.isEmpty(paramsDTO.getSortType())) {
             paramsDTO.setSortType("desc");
-        }
+        }·
         paramsDTO.setAreaType("store");
         Map<String, Object> returnMap = new HashMap<String, Object>();
         Page<AreaLoginDTO> page = maidianDataService.areaRankingList(paramsDTO);