Merge branch 'feature/01-10' into developer

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

@@ -372,7 +372,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             checkQywxSettingApiService.saveFriendCallback(wxEnterpriseId, null, dto);
             return;
         }
-        TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId( wxUserId, wxEnterpriseId);
+        TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
         if (staff == null) {
             log.info("staff不存在：{},{}", dto.getUnionid(), dto.getWxUserId());
             return;
@@ -736,7 +736,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     public MemberUnionidRelatedDTO getMemberUnionidRelatedDTONew(MemberUnionidRelatedDTO dto) {
         log.info("【新增外部联系人回调】dto={}", JSON.toJSONString(dto));
         String corpId = dto.getCorpid();
-        TabHaobanWxApplication tabHaobanWxApplication = wxApplicationMapper.selectByCorpId(corpId,null);
+        TabHaobanWxApplication tabHaobanWxApplication = wxApplicationMapper.selectByCorpId(corpId, null);
         if (tabHaobanWxApplication == null) {
             log.info("查询tab_haoban_wx_application为空：{}", corpId);
             return null;
@@ -1169,14 +1169,26 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             jp.setErrorMessage("群发素材不存在, 群发创建失败");
             return jp;
         }
+        WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
         //请求参数赋值
         qywxExternalMessageDTO.setChatType("single");
         qywxExternalMessageDTO.setExternalUserid(extendUserList);
+        String corpid = enterprise.getCorpid();
+        if (corpid.length() > 20) {
+            TabHaobanStaff tabHaobanStaff = staffService.selectByUserIdAndEnterpriseId(userId, wxEnterpriseId);
+            if (tabHaobanStaff == null) {
+                JSONResponse jp = new JSONResponse();
+                jp.setErrorCode(-1);
+                jp.setErrorMessage("员工未查询到，群发创建失败,userId:"+userId);
+                return jp;
+            }
+            qywxExternalMessageDTO.setSenderUserId(tabHaobanStaff.getWxOpenUseId());
+        } else {
             qywxExternalMessageDTO.setSenderUserId(userId);
+        }
         qywxExternalMessageDTO.setAttachments(messageMaterialList);
         //调接口执行创建群发
-        WxEnterpriseDTO enterprise = wxEnterpriseService.selectById(wxEnterpriseId);
-        return qywxSuiteApiService.sendExternalMessage(enterprise.getCorpid(), config.getWxSuiteid(), qywxExternalMessageDTO);
+        return qywxSuiteApiService.sendExternalMessage(corpid, config.getWxSuiteid(), qywxExternalMessageDTO);
     }
 
     /**
@@ -1746,6 +1758,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
     @Override
     public MemberUnionidRelatedDTO getBySelfExternalUserId(String wxEnterpriseId, String selfExternalUserId) {
-        return memberUnionRelatedService.getBySelfExternalUserId(wxEnterpriseId,selfExternalUserId);
+        return memberUnionRelatedService.getBySelfExternalUserId(wxEnterpriseId, selfExternalUserId);
     }
 }