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

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmLinkWxaDTO.java

@@ -17,6 +17,7 @@ public class HmLinkWxaDTO implements Serializable {
     private static final long serialVersionUID = 6473795387449522116L;
 
     private Long pageId ;
+    private Long hmId ;
     private HmPageDTO page;
     // 二维码
     private String hmQrcode;
@@ -31,6 +32,14 @@ public class HmLinkWxaDTO implements Serializable {
     // 说明
     private String sm ;
     
+    public Long getHmId() {
+        return hmId;
+    }
+
+    public void setHmId(Long hmId) {
+        this.hmId = hmId;
+    }
+
     public HmPageDTO getPage() {
         return page;
     }

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

@@ -10,6 +10,7 @@ import java.util.stream.Collectors;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.pattern.AbstractStyleNameConverter.Red;
 import org.redisson.api.RRateLimiter;
 import org.redisson.api.RateIntervalUnit;
 import org.redisson.api.RateType;
@@ -332,6 +333,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
         }
         if (null != hm) {
             log.info("获取到单人活码={}",JSON.toJSONString(hm));
+            retDTO.setHmId(hm.getHmId());
             // 判断是否已经是好友
             boolean isFriend = false;
             if (null != memberId) {