Merge remote-tracking branch 'origin/developer' into developer

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

@@ -240,9 +240,9 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                         if (null == hm && StringUtils.isNotBlank(mainStoreId)) {
                             hm = this.getHmFormStore(wxEnterpriseId, mainStoreId, fwStore.getDz(), fwStore.getDy());
                         }
-                    }
-                    if(null != hm) {
-                        retDTO.setSm("会员主门店活码");
+                        if(null != hm) {
+                            retDTO.setSm("会员主门店活码");
+                        }
                     }
                     // 协管门店
                     List<MemberStoreClerkDataDTO> list = member.getStoreClerkRel();
@@ -281,9 +281,9 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                                 }
                             }
                         }
-                    }
-                    if(null != hm) {
-                        retDTO.setSm("会员协管活码");
+                        if(null != hm) {
+                            retDTO.setSm("会员协管活码");
+                        }
                     }
                 }
             }
@@ -310,7 +310,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
             }
         }
         if (null != hm) {
-            log.info("获取的单人活码={}",JSON.toJSONString(hm));
+            log.info("获取到单人活码={}",JSON.toJSONString(hm));
             // 判断是否已经是好友
             boolean isFriend = false;
             if (null != memberId) {
@@ -321,6 +321,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                     isFriend = true;
                     log.info("已经是好友,staffid={},memberId={}", staffId, memberId);
                     retDTO.setHmQrcode(hm.getWxQrcode());
+                    retDTO.setSm("老好友,取单人活码");
                 }
             }
 
@@ -333,8 +334,10 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                 if (null != dthmKey) {
                     ServiceResponse<String> addResp = this.addQrcode(hm, dthmKey, wxEnterpriseDTO.getCorpid(), retDTO);
                     if (!addResp.isSuccess()) {
+                        retDTO.setSm("创建动态活码失败,取单人活码");
                         retDTO.setHmQrcode(hm.getWxQrcode());
                     } else {
+                        retDTO.setSm("动态活码");
                         retDTO.setHmQrcode(addResp.getResult());
                     }
                 }