Merge branch 'eature/xgh/bug0808' into 'master'

Eature/xgh/bug0808

See merge request !2125

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

@@ -36,7 +36,7 @@ public interface QywxSendService {
     * @return
     * @throws
      */
-    public ServiceResponse<String> sendChatMessage(String wxEnterpriseId, String staffId,  List<String> materialIdList);
+    public ServiceResponse<String> sendChatMessage(String wxEnterpriseId, String staffId,  List<String> materialIdList, int planType ,String planId);
 
     /**
      * 群群发

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

@@ -399,7 +399,7 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
                     String staffId = ownerLog.getStaffId();
                     if (plan.getMaterialFrom() == null || plan.getMaterialFrom() == 1) {
                         sendResp = qywxSendService.sendChatMessage(wxEnterpriseId, staffId,
-                                sendIdList);
+                                sendIdList,2,planId+"");
                     }else {
                         sendResp = qywxSendService.sendChatMessage(wxEnterpriseId, staffId,
                                 materialList,message);

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

@@ -244,8 +244,8 @@ public class QywxSendServiceImpl implements QywxSendService {
     }
     
     @Override
-    public ServiceResponse<String> sendChatMessage(String wxEnterpriseId, String staffId, List<String> materialIdList) {
-        return this.send(wxEnterpriseId, staffId, null, materialIdList, null, 1 , group,null,null);
+    public ServiceResponse<String> sendChatMessage(String wxEnterpriseId, String staffId, List<String> materialIdList,int planType ,String planId) {
+        return this.send(wxEnterpriseId, staffId, null, materialIdList, null, 1 , group,planId,planType);
     }
 
     @Override

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

@@ -537,33 +537,29 @@ public class WxStaffController extends WebBaseController {
         if (StringUtils.isAnyBlank(clerkIds)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
-        com.gic.enterprise.api.dto.StoreDTO store = storeService.getStoreByIdNoStatus(storeId);
-        // 校验手机是否唯一
-        if (store == null) {
-            return resultResponse(HaoBanErrCode.ERR_400001);
-        }
         AuditSettingDTO dto = auditSettingApiService.findSettingByWxEnterpriseId(wxEnterpriseId);
         if (dto.getClerkChangeFlag() == 1) {
             // 需要审核
             String[] clerkIdArr = clerkIds.split(",");
             for (String clerkId : clerkIdArr) {
+                ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
+                if (clerkDTO == null) {
+                    logger.info("导购不存在", clerkId);
+                    continue;
+                }
+                com.gic.enterprise.api.dto.StoreDTO store = storeService.getStoreByIdNoStatus(clerkDTO.getStoreId());
                 AuditDTO auditDTO = auditApiService.findByBindRelatedIdAndAuditType(clerkId,
                         AuditType.CLERK_DEL.getCode(), wxEnterpriseId, store.getEnterpriseId());
                 if (auditDTO != null) {
                     logger.info("已经存在了审核记录，待审核{}", clerkId);
                     continue;
                 }
-                ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
-                if (clerkDTO == null) {
-                    logger.info("导购不存在", clerkId);
-                    continue;
-                }
                 StaffDTO staff = staffApiService.selectById(staffId);
                 AuditDTO audit = new AuditDTO();
                 audit.setCommitStaffName(staff.getStaffName());
                 audit.setCommitStaffId(staffId);
                 audit.setCommitStaffImg(staff.getHeadImg());
-                audit.setCommitStoreId(storeId);
+                audit.setCommitStoreId(clerkDTO.getStoreId());
                 audit.setCommitStoreName(store.getStoreName());
                 audit.setAuditStatus(AuditStatus.NO_AUDIT.getCode());
                 audit.setWxEnterpriseId(wxEnterpriseId);
@@ -591,18 +587,19 @@ public class WxStaffController extends WebBaseController {
                     logger.info("导购不存在：{}", clerkId);
                     continue;
                 }
-                if (distributeApiService.getClerkMemberCount(clerkDTO.getEnterpriseId(), clerkId, storeId) == 0) {
+                if (distributeApiService.getClerkMemberCount(clerkDTO.getEnterpriseId(), clerkId, clerkDTO.getStoreId()) == 0) {
                     if (clerkDTO.getClerkType() == 1) {
                         logger.info("店长不能删除：{}", clerkId);
                         continue;
                     }
                 }
+                com.gic.enterprise.api.dto.StoreDTO store = storeService.getStoreByIdNoStatus(clerkDTO.getStoreId());
                 StaffDTO staff = staffApiService.selectById(staffId);
                 AuditDTO audit = new AuditDTO();
                 audit.setCommitStaffName(staff.getStaffName());
                 audit.setCommitStaffId(staffId);
                 audit.setCommitStaffImg(staff.getHeadImg());
-                audit.setCommitStoreId(storeId);
+                audit.setCommitStoreId(clerkDTO.getStoreId());
                 audit.setCommitStoreName(store.getStoreName());
                 audit.setAuditStatus(AuditStatus.NOT_NEED_AUDIT.getCode());
                 audit.setWxEnterpriseId(wxEnterpriseId);