Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

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

@@ -6,7 +6,7 @@ public class HmQrcodeGroupNumBO implements Serializable {
 
     private static final long serialVersionUID = -7006820026168431701L;
     private Integer num;
-    private Integer hmGroupId;
+    private Long hmGroupId;
     private String hmGroupName;
 
     public Integer getNum() {
@@ -17,11 +17,11 @@ public class HmQrcodeGroupNumBO implements Serializable {
         this.num = num;
     }
 
-    public Integer getHmGroupId() {
+    public Long getHmGroupId() {
         return hmGroupId;
     }
 
-    public void setHmGroupId(Integer hmGroupId) {
+    public void setHmGroupId(Long hmGroupId) {
         this.hmGroupId = hmGroupId;
     }
 

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

@@ -370,6 +370,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String memberId = "";
         if (StringUtils.isNotBlank(unionid)) {
             log.info("有unionid处理：wxEnterpriseId:{}，unionid：{}", wxEnterpriseId,unionid);
+            dto.setUnionid(unionid);
             memberId = addExternalClerkRelated(dto, staffId, staffClerkRelationDTO, wxEnterpriseRelated);
         } else {
             log.info("发送欢迎语逻辑：wxEnterpriseId:{}", wxEnterpriseId);
@@ -377,6 +378,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         }
 
         if (StringUtils.isNotBlank(memberId)) {
+            log.info("插入加好友日志");
             wxUserAddLogQDTO.setWxEnterpriseId(wxEnterpriseId);
             wxUserAddLogQDTO.setEnterpriseId(enterpriseId);
             wxUserAddLogQDTO.setMemberId(memberId);

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

@@ -116,13 +116,13 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
         result.addAll(groupDtoPage.getResult());
         List<Long> groupIds = result.stream().map(HmGroupDTO::getGroupId).collect(Collectors.toList());
         List<HmQrcodeGroupNumBO> qrcodeGroupNumBoList = qrcodeService.getGroupIdNumByEnterpriseId(groupQueryDTO.getEnterpriseId(), groupIds);
-        Map<Integer, Integer> qrcodeGroupNumMap = Collections.emptyMap();
+        Map<Long, Integer> qrcodeGroupNumMap = Collections.emptyMap();
         if (CollectionUtils.isNotEmpty(qrcodeGroupNumBoList)) {
             qrcodeGroupNumMap = qrcodeGroupNumBoList.stream()
                     .collect(Collectors.toMap(HmQrcodeGroupNumBO::getHmGroupId, HmQrcodeGroupNumBO::getNum, (v1, v2) -> v1));
         }
         for (HmGroupDTO groupDTO : result) {
-            Integer referNum = Optional.ofNullable(qrcodeGroupNumMap.get(groupDTO.getGroupId().intValue())).orElse(0);
+            Integer referNum = Optional.ofNullable(qrcodeGroupNumMap.get(groupDTO.getGroupId())).orElse(0);
             groupDTO.setReferNum(referNum);
             if (!DEFAULT_GROUP_ID.equals(groupDTO.getGroupId())) {
                 groupDTO.setDefaultFlag(0);