Merge branch 'feature/xgh/202504会员分组' into 'master'

Feature/xgh/202504会员分组

See merge request !2864

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

@@ -332,6 +332,12 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("planId",planId) ;
         jsonObject.put("ownerLogId",ownerLogId) ;
+        if(null != clerkId) {
+            ClerkDTO clerk = this.clerkService.getclerkById(clerkId);
+            if (null != clerk) {
+                jsonObject.put("storeId", clerk.getStoreId());
+            }
+        }
         int messageType = NoticeMessageTypeEnum.GROUP_CHAT_PLAN.getType();
         NoticeMessageUtil.sendNoticeMessageByStaff(enterpriseId,staffId,clerkId,messageType,null,map,jsonObject);
     }

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

@@ -269,6 +269,10 @@ public class MaterialServiceImpl implements MaterialService {
               jp = qywxSuiteApiService.uploadAttachment(qwDTO.getThirdCorpid(), qwDTO.getSelf3thSecret(), url, arr[count - 1], fileType.getCode() , selfFlag , qwDTO.getUrlHost());
           }else {
               // 群发上传
+              if(!url.contains("?")) {
+                  url += "?imageView2/2/w/1080/h/10800/format/jpg";
+                  logger.info("url={}",url);
+              }
               jp = qywxSuiteApiService.uploadMedia(qwDTO.getThirdCorpid(), qwDTO.getSelf3thSecret(), url, arr[count - 1], fileType.getCode() , selfFlag , qwDTO.getUrlHost());
           }
           if (jp.getErrorCode() == 0) {

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

@@ -232,6 +232,10 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("planId",planId) ;
         jsonObject.put("clerkId",clerkId) ;
+        ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
+        if(null != clerk) {
+            jsonObject.put("storeId", clerk.getStoreId());
+        }
         NoticeMessageUtil.sendNoticeMessage(enterpriseId,clerkId,messageType,null,map,jsonObject);
     }
 

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

@@ -114,6 +114,9 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
          }
         Long planId = log.getPlanId() ;
         GroupChatPlanBO plan = this.groupChatPlanService.getById(planId) ;
+        if(null == plan) {
+            return ServiceResponse.failure("9999","计划不存在或已删除") ;
+        }
         dto.setPlanName(plan.getName());
         if(dto.getSendStatus()==1) {
             if(plan.getSendFlag()==0 || plan.getEndTime().getTime() < System.currentTimeMillis()) {

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

@@ -1560,6 +1560,9 @@ public class WxStaffController extends WebBaseController {
      */
     @RequestMapping(value = "/queryMenuCodesByClerkType", method = RequestMethod.GET)
     public RestResponse<HaobanRoleDTO> queryMenuByClerkType(Integer clerkType, String staffId, String wxEnterpriseId , String enterpriseId) {
+        if(StringUtils.isBlank(wxEnterpriseId) || wxEnterpriseId.equals("-1") || StringUtils.isBlank(enterpriseId) || "-1".equals(enterpriseId)) {
+            return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_2.getCode()), HaoBanErrCode.ERR_2.getMsg());
+        }
         if (clerkType == null) {
             return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_2.getCode()), HaoBanErrCode.ERR_2.getMsg());
         }