Merge branch 'master_xgh_pendingid' into 'developer'

Master xgh pendingid

See merge request !286

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

@@ -640,19 +640,20 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         }
         if (null == memberId) {
             log.info("【新增外部联系人会员】enterpriseId={},unionId={},name={},avatar={},QrcodeParam={}", enterpriseId, unionId, name, avatar, qrcodeParam);
-            // member = memberOpenCardBusinessService.getMemberByQywxChannelParam(enterpriseId, unionId, "", name, avatar, qrcodeParam);
             QywxMemberQDTO qdto = new QywxMemberQDTO() ;
             qdto.setEnterpriseId(enterpriseId);
             qdto.setNick(name);
             qdto.setPhotoUrl(avatar);
             qdto.setQrcodeParam(qrcodeParam);
-            qdto.setUnionId(unionId);
+            qdto.setUnionId(unionId+"123");
             qdto.setUserId(externalUserid);
             qdto.setSence(2);
             com.gic.api.base.commons.ServiceResponse<MemberSimpleDetailDTO> resp = this.memberEntranceApiService.enterpriseWechatByFriendEntrance(qdto);
             if(resp.isSuccess()) {
                 MemberSimpleDetailDTO member = resp.getResult() ;
                 memberId = member.getMemberId() ;
+            }else {
+                log.info(JSON.toJSONString(resp));
             }
         }
         if (memberId == null) {