Merge branch 'feature/xgh/导购任务' into 'developer'

Feature/xgh/导购任务

See merge request !2233

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/HaobanRoleOperationController.java

 package com.gic.haoban.manage.web.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.authcenter.commons.dto.AuthcenterUserDetails;
 import com.gic.authcenter.commons.util.SessionContextUtil;
@@ -10,6 +11,8 @@ import com.gic.haoban.manage.api.dto.role.HaobanMenuDTO;
 import com.gic.haoban.manage.api.dto.role.HaobanRoleDTO;
 import com.gic.haoban.manage.api.service.role.HaobanMenuApiService;
 import com.gic.haoban.manage.api.service.role.HaobanRoleApiService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,6 +30,9 @@ import java.util.List;
 @RestController
 public class HaobanRoleOperationController {
 
+    private static Logger logger  = LoggerFactory.getLogger(HaobanRoleOperationController.class);
+
+
     @Autowired
     private HaobanMenuApiService haobanMenuApiService;
     @Autowired
@@ -56,6 +62,7 @@ public class HaobanRoleOperationController {
         login.setClerkId(operationUserId);
         login.setClerkName(loginUser.getLoginName());
         haobanRoleQDTO.setSystemFlag(0);
+        logger.info("运维好办权限={},{}", JSONObject.toJSONString(haobanRoleQDTO),operationUserId);
         return RestResponse.successResult(haobanRoleApiService.edit(haobanRoleQDTO,login));
     }
 

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

@@ -115,13 +115,15 @@ public class OpenStaffServiceImpl implements OpenStaffService {
         if (StringUtils.isNotBlank(noticeReason)) {
             log.info("发送退出登录通知,staffId={}", openStaff.getStaffId());
             TabHaobanStaff staff = this.staffMapper.selectByPrimaryKey(openStaff.getStaffId());
-            this.noticeMessageApiService.sendMessageForOpenStaff(openStaff.getEnterpriseId(), staff.getStaffName(), noticeReason);
-            //  发送通知
-            if(!noticeReason.equals(OpenStaffOfflineEnum.OFFLINE1.getDesc())) {
-                Map<String, String> map = new HashMap<String, String>();
-                map.put("reason", noticeReason);
-                int messageType = NoticeMessageTypeEnum.HAOBAN_OPEN_STAFF_LOGOUT.getType();
-                NoticeMessageUtil.sendNoticeMessageByStaff(openStaff.getEnterpriseId(), openStaff.getStaffId(), "-1", messageType, null, map, null);
+            if(null != staff) {
+                this.noticeMessageApiService.sendMessageForOpenStaff(openStaff.getEnterpriseId(), staff.getStaffName(), noticeReason);
+                //  发送通知
+                if(!noticeReason.equals(OpenStaffOfflineEnum.OFFLINE1.getDesc())) {
+                    Map<String, String> map = new HashMap<String, String>();
+                    map.put("reason", noticeReason);
+                    int messageType = NoticeMessageTypeEnum.HAOBAN_OPEN_STAFF_LOGOUT.getType();
+                    NoticeMessageUtil.sendNoticeMessageByStaff(openStaff.getEnterpriseId(), openStaff.getStaffId(), "-1", messageType, null, map, null);
+                }
             }
         }
     }

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

@@ -5,6 +5,7 @@ import com.gic.api.base.commons.Page;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GICMQClientUtil;
 import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.common.utils.DingUtils;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.service.HandoverOperationApiService;
@@ -291,7 +292,8 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
             List<String> list = entry.getValue();
             QywxTransferCustomerDTO transferCustomerResp = qywxUserApiService.transferCustomer(qwDTO.getThirdCorpid(), qwDTO.getSelf3thSecret(), wxUserId, takeoverUserId, list,qwDTO.isSelf(),qwDTO.getUrlHost());
             if (transferCustomerResp.getErrcode() != 0) {
-                logger.info("转移异常");
+                logger.info("离职继承-分配客户异常={}",JSONObject.toJSONString(transferCustomerResp));
+                DingUtils.send("离职继承分配异常"+wxUserId,true);
             }
             List<QywxTransferCustomerInfoDTO> customer = transferCustomerResp.getCustomer();
             if (CollectionUtils.isEmpty(customer)) {

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

@@ -134,6 +134,11 @@ public class OpenStaffApiServiceImpl implements OpenStaffApiService {
             log.info("只能托管一个企业={},{}", uuid, corpName);
             return ServiceResponse.failure("9999", "只能托管一个企业");
         }
+        if(!openStaff.getStaffId().equals(staff.getStaffId())) {
+            this.openStaffService.logout(uuid, "userid不能关联2个成员", 0, null);
+            log.info("userid不能关联2个成员={},{},{}", openStaff.getStaffId(), staff.getStaffId(),qwUserId);
+            return ServiceResponse.failure("9999", "userid不能关联2个成员");
+        }
         openStaff.setWxCorpId(qwCorpId);
         openStaff.setQwUserId(qwUserId);
         if (null == openStaff.getFirstAuthTime()) {

haoban-manage3-service/src/main/resources/mapper/OpenStaffMapper.xml

@@ -205,6 +205,7 @@
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_open_staff where qw_user_id = #{qwUserId} and delete_flag = 0
+        order by status_flag , update_time desc limit 1
     </select>
 
     <select id="listAllStaffId" resultType="java.lang.String">

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

@@ -130,7 +130,7 @@ public class ContentCreativeController {
             // 发送审批消息
             // 不是私域，且未开启自动审核
             ServiceResponse<ContentSettingDTO> resp = this.contentSettingApiService.queryContentSettingInfo(saveQO.getEnterpriseId()) ;
-            if(resp.getResult().getCommunityUserSetting().getClerkMaterialAudit()==null || resp.getResult().getCommunityUserSetting().getClerkMaterialAudit()==0) {
+            if(response.getResult().getMaterialType() == 4 || (resp.getResult().getCommunityUserSetting().getClerkMaterialAudit()==null || resp.getResult().getCommunityUserSetting().getClerkMaterialAudit()==0)) {
                 this.sendAudit(saveQO.getEnterpriseId(),saveQO.getClerkId()) ;
             }
         }
@@ -141,7 +141,7 @@ public class ContentCreativeController {
         ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
         String clerkName = clerk.getClerkName() ;
         Map<String, String> map = new HashMap<>();
-        map.put("clerkName", clerkName);
+        map.put("clerkName", "导购："+clerkName);
         this.send(enterpriseId,map,"clerkCreateContent");
     }