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

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

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author mozhu
+ * @date 2022/1/22 17:05
+ */
+public class MemberUnionidWechatAccountQDTO implements Serializable {
+
+    private static final long serialVersionUID = -3157724333718434496L;
+    /**
+     * 企业id
+     */
+    private String enterpriseId;
+    /**
+     * unionid
+     */
+    private String unionid;
+    /**
+     * 导购id
+     */
+    private String clerkId;
+    /**
+     * 微信企业id
+     */
+    private String wxEnterpriseId;
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getUnionid() {
+        return unionid;
+    }
+
+    public void setUnionid(String unionid) {
+        this.unionid = unionid;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java

@@ -140,6 +140,7 @@ public interface MemberUnionidRelatedApiService {
 
     /**
      * 刷新企微好友
+     *
      * @param res
      */
     @Deprecated
@@ -197,6 +198,28 @@ public interface MemberUnionidRelatedApiService {
      * @author mozhu
      * @date 2021-12-23 22:39:25
      */
-	MemberUnionidRelatedDTO getBySelfExternalUserId(String wxEnterpriseId,String selfExternalUserId);
+    MemberUnionidRelatedDTO getBySelfExternalUserId(String wxEnterpriseId, String selfExternalUserId);
+
+
+    /**
+     * 关注公共号-会员回调好办关联好友（通过查询unionid关联导购对外联系人id接口）
+     * "routerName"：addMemberUnionidWechatAccountMq
+     *
+     * @param res res
+     * @author mozhu
+     * @date 2022-01-22 16:59:25
+     */
+    void addMemberUnionidWechatAccount(String res);
+
+
+    /**
+     * 关注公共号-会员回调好办关联好友（通过公共号二维码带参数）
+     *
+     * @param memberUnionidWechatAccountQDTO 成员unionid qdto微信帐户
+     * @return {@link ServiceResponse<Boolean> }
+     * @author mozhu
+     * @date 2022-01-22 17:06:24
+     */
+    ServiceResponse<Boolean> addMemberUnionidWechatAccountByClerk(MemberUnionidWechatAccountQDTO memberUnionidWechatAccountQDTO);
 
 }

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -143,4 +143,5 @@
     <dubbo:reference interface="com.gic.clerk.api.service.PowerService" id="powerService"/>
     <dubbo:reference interface="com.gic.enterprise.api.service.AuthorizeService" id="authorizeService"/>
     <dubbo:reference id="quartzService" interface="com.gic.quartz.api.service.QuartzService" timeout="10000"/>
+    <dubbo:reference id="memberApiService" interface="com.gic.member.api.service.MemberApiService" timeout="10000"/>
 </beans>
\ No newline at end of file

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

@@ -408,24 +408,25 @@ public class WxEnterpriseInfoController extends WebBaseController {
         if (StringUtils.isAnyBlank(externalUserid, wxUserId, wxEnterpriseId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
+
         WxEnterpriseRelationDetailDTO enterpriseBindInfo = wxEnterpriseRelatedApiService.getEnterpriseBindInfo(wxEnterpriseId, gicEnterpriseId);
         if (null == enterpriseBindInfo) {
-            logger.info("企业不存在没有绑定");
+            logger.info("企业不存在没有绑定,wxEnterpriseId:{}", wxEnterpriseId);
             return resultResponse(HaoBanErrCode.ERR_400002);
         }
         MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getBySelfExternalUserId(wxEnterpriseId, externalUserid);
         if (null == memberUnionidRelatedDTO) {
-            logger.info("请刷新好友");
+            logger.info("请刷新好友，wxEnterpriseId:{},externalUserid：{},wxUserId:{}", wxEnterpriseId, externalUserid, wxUserId);
             return resultResponse(HaoBanErrCode.ERR_11123);
         }
         ExternalClerkRelatedDTO clerkRelatedDTO = externalClerkRelatedApiService.getExternalClerkByWxUserIdAncExternalUserId(wxEnterpriseId, wxUserId, gicEnterpriseId, memberUnionidRelatedDTO.getExternalUserid());
         if (clerkRelatedDTO == null) {
-            logger.info("该企业没有对应需要发送好友关系的信息");
+            logger.info("该企业没有对应需要发送好友关系的信息，wxEnterpriseId:{},externalUserid：{},wxUserId:{}", wxEnterpriseId, externalUserid, wxUserId);
             return resultResponse(HaoBanErrCode.ERR_11123);
         }
         MiniprogramSettingDTO settingDTO = wxEnterpriseApiService.getMiniprogramSettingByEid(wxEnterpriseId, gicEnterpriseId);
         if (null == settingDTO) {
-            logger.info("该企业没有对应需要发送的小程序信息");
+            logger.info("该企业没有对应需要发送的小程序信息，wxEnterpriseId:{}", wxEnterpriseId);
             return resultResponse(HaoBanErrCode.ERR_11124);
         }
         EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(gicEnterpriseId);