链接关联手机号

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/hm/KeyDataLinkBO.java

@@ -11,6 +11,15 @@ public class KeyDataLinkBO implements Serializable{
     private String unionid;
     private Long hmId;
     private Long linkId;
+    private String phone ;
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
 
     public String getUnionid() {
         return unionid;

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

@@ -231,6 +231,15 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                 remarkMap.put("sm", "会员选门店活码");
             }
         }
+        String mobile = null ;
+        if (StringUtils.isNotEmpty(mixPhone)) {
+            mobile = this.keyDataService.getMobile(mixPhone, linkShortCode);
+            log.info("查询手机号,mobile={},mixPhone={}", mobile, mixPhone);
+            String mobileMemberId = this.memberService.getMemberIdByPhoneNumber(mobile, enterpriseId);
+            if (StringUtils.isNotBlank(mobileMemberId)) {
+                memberId = mobileMemberId;
+            }
+        }
         // 会员门店
         if (null == hm) {
             HmLinkStoreSettingDTO fwStore = null;
@@ -247,14 +256,6 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                 if (null == xgStore || xgStore.getOpen() == 0) {
                     xgStore = null;
                 }
-                if (StringUtils.isNotEmpty(mixPhone)) {
-                    String mobile = this.keyDataService.getMobile(mixPhone, linkShortCode);
-                    log.info("小程序获取活码mobile={},mixPhone={}", mobile, mixPhone);
-                    String mobileMemberId = this.memberService.getMemberIdByPhoneNumber(mobile, enterpriseId);
-                    if (StringUtils.isNotBlank(mobileMemberId)) {
-                        memberId = mobileMemberId;
-                    }
-                }
                 log.info("小程序获取活码memberId={}", memberId);
                 if (StringUtils.isNotBlank(memberId)) {
                     MemberDataDTO member = this.getMemberClerk(enterpriseId, memberId);
@@ -375,6 +376,9 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                 bo.setUnionid(unionid);
                 bo.setLinkId(linkId);
                 bo.setHmId(hm.getHmId());
+                if(StringUtils.isNotBlank(mixPhone) && StringUtils.isNotBlank(mobile)) {
+                    bo.setPhone(mobile);
+                }
                 String dthmKey = this.keyDataService.saveDataForLink(enterpriseId, bo);
                 remarkMap.put("dthmKey", dthmKey);
                 if (null != dthmKey) {