Merge branch 'master_xgh_pendingid' into 'developer'

Master xgh pendingid

See merge request !288

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

@@ -30,6 +30,7 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
 		dto.setCreateTime(new Date());
 		dto.setUpdateTime(new Date());
 		dto.setMemberUnionidRelatedId(StringUtil.randomUUID());
+		dto.setUnionid(null);
 		mapper.insert(EntityUtil.changeEntityByJSON(MemberUnionidRelated.class, dto));
 		return dto.getMemberUnionidRelatedId();
 	}

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

@@ -1610,8 +1610,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String storeId = dto.getStoreId();
         String clerkId = dto.getClerkId();
         String staffId = dto.getStaffId();
-        if (StringUtils.isAnyBlank(wxUserId, wxEnterpriseId, name, createTime, externalUserId, memberId, storeId, enterpriseId, staffId, clerkId)) {
-            log.info("【新增外部联系人】wxUserId={},wxEnterpriseId={},name={},createTime={},unionId ={},externalUserId ={},memberId ={},storeId ={},enterpriseId ={},staffId={},clerkId={}"
+        if (StringUtils.isAnyBlank(wxUserId, wxEnterpriseId, name, createTime, externalUserId, storeId, enterpriseId, staffId, clerkId)) {
+            log.info("【刷新好友】参数有空wxUserId={},wxEnterpriseId={},name={},createTime={},unionId ={},externalUserId ={},memberId ={},storeId ={},enterpriseId ={},staffId={},clerkId={}"
                     + "", wxUserId, wxEnterpriseId, name, createTime, unionId, externalUserId, memberId, storeId, enterpriseId, staffId, clerkId);
             return "参数不对";
         }