会员工具

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

@@ -531,9 +531,9 @@ public class WxEnterpriseInfoController extends WebBaseController {
     @IgnoreLogin
     @HttpLimit
     @RequestMapping("get-send-message-info")
-    public HaobanResponse getMessageMember(String externalUserid, String wxUserId, String wxEnterpriseId, String gicEnterpriseId) {
-        logger.info("会员工具传入参数：externalUserid:{},wxUserId:{},wxEnterpriseId:{},gicEnterpriseId:{}", externalUserid, wxUserId, wxEnterpriseId, gicEnterpriseId);
-        if (StringUtils.isAnyBlank(externalUserid, wxUserId, wxEnterpriseId)) {
+    public HaobanResponse getMessageMember(String externalUserid, String staffId , String wxEnterpriseId, String gicEnterpriseId) {
+        logger.info("会员工具传入参数：externalUserid:{},wxUserId:{},wxEnterpriseId:{},gicEnterpriseId:{}", externalUserid, staffId, wxEnterpriseId, gicEnterpriseId);
+        if (StringUtils.isAnyBlank(externalUserid, staffId, wxEnterpriseId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
         WxEnterpriseRelationDetailDTO enterpriseBindInfo = wxEnterpriseRelatedApiService.getEnterpriseBindInfo(wxEnterpriseId, gicEnterpriseId);
@@ -541,18 +541,26 @@ public class WxEnterpriseInfoController extends WebBaseController {
             logger.info("企业不存在没有绑定,wxEnterpriseId:{}", wxEnterpriseId);
             return resultResponse(HaoBanErrCode.ERR_400002);
         }
-        StaffDTO staffDTO = staffApiService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
+        StaffDTO staffDTO = staffApiService.selectById(staffId);
         if (staffDTO == null) {
-            logger.info("查询到该员工,wxUserId:{}", wxUserId);
+            logger.info("查询到该员工,wxUserId:{}", staffId);
+            return resultResponse(HaoBanErrCode.ERR_400017);
+        }
+        if(!staffDTO.getWxEnterpriseId().equals(wxEnterpriseId)) {
+            logger.info("查询到该员工,异常");
             return resultResponse(HaoBanErrCode.ERR_400017);
         }
-        String staffId = staffDTO.getStaffId();
         ClerkMainStoreRelatedDTO clerkMainStoreRelatedDTO = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(wxEnterpriseId, staffId);
         if (clerkMainStoreRelatedDTO == null) {
-            logger.info("未设置主门店,wxUserId:{}", wxUserId);
+            logger.info("未设置主门店,wxUserId:{}", staffId);
             return resultResponse(HaoBanErrCode.ERR_400021);
         }
         //获取自建客户详情
+        WxEnterpriseQwDTO qwInfo = this.wxEnterpriseApiService.getQwInfo(wxEnterpriseId) ;
+        String wxUserId = staffDTO.getWxUserId() ;
+        if(qwInfo.needOpenUserIdDk()) {
+            wxUserId = staffDTO.getWxOpenUseId() ;
+        }
         ExternalUserDTO externalUserDTO = memberUnionidRelatedApiService.getCorpSelfExternalUseridInfo(wxEnterpriseId, wxUserId, externalUserid);
         if (externalUserDTO == null) {
             logger.info("请先添加好友，企业微信未查询到该好友,externalUserid:{}", externalUserid);