值班客服修改

src/main/java/com/ydtech/modules/admin/service/SysWechatCustomerService.java

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
 import com.ydtech.exception.SystemException;
 import com.ydtech.extension.BaseIService;
 import com.ydtech.modules.admin.model.po.SysWechatCustomer;
+import com.ydtech.modules.admin.model.po.SysWechatCustomerDuty;
 import com.ydtech.modules.admin.model.vo.wechat.SysWechatCustomerDutyRulesVo;
 import com.ydtech.modules.admin.model.vo.wechat.SysWechatCustomerQueryVo;
 import com.ydtech.modules.admin.model.vo.wechat.SysWechatCustomerVo;
@@ -80,5 +81,5 @@ public interface SysWechatCustomerService extends BaseIService<SysWechatCustomer
      * @return true 一致  false 不一致
      *
      */
-    boolean whetherTheManagersAreConsistent(String externalUserId, SysWechatCustomer sysWechatCustomer);
+    boolean whetherTheManagersAreConsistent(String externalUserId, SysWechatCustomer sysWechatCustomer,  List<SysWechatCustomerDuty> sysWechatCustomerDuties);
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysWechatCustomerServiceImpl.java

@@ -149,7 +149,7 @@ public class SysWechatCustomerServiceImpl extends ServiceImpl<SysWechatCustomerM
 
 
     @Override
-    public boolean whetherTheManagersAreConsistent(String externalUserId, SysWechatCustomer sysWechatCustomer) {
+    public boolean whetherTheManagersAreConsistent(String externalUserId, SysWechatCustomer sysWechatCustomer,  List<SysWechatCustomerDuty> sysWechatCustomerDuties) {
         SysUser sysUser = sysUserService.lambdaQuery().eq(SysUser::getExternalUserId, externalUserId).one();
         if (ObjectUtils.isEmpty(sysUser)) {
             return true;
@@ -157,11 +157,12 @@ public class SysWechatCustomerServiceImpl extends ServiceImpl<SysWechatCustomerM
         if(!StringUtils.hasLength(sysUser.getLeaderId())){
             return true;
         }
-
-        return sysWechatCustomer.getUserId().equals(sysUser.getLeaderId());
+        if(sysWechatCustomerDuties.isEmpty()){
+            return sysWechatCustomer.getUserId().equals(sysUser.getLeaderId());
+        }
+        return true;
     }
 
-
 }
 
 

src/main/java/com/ydtech/modules/admin/service/impl/WechatCustomerServiceImpl.java

@@ -96,7 +96,7 @@ public class WechatCustomerServiceImpl implements WechatCustomerService {
                 // 1 管理人是否一致
                 // 2 休息日
                 // 3 工作时间内 安排了值班客服
-                boolean unanimous = !sysWechatCustomerService.whetherTheManagersAreConsistent(wxCpKfMsgItem.getExternalUserId(), sysWechatCustomer);
+                boolean unanimous = !sysWechatCustomerService.whetherTheManagersAreConsistent(wxCpKfMsgItem.getExternalUserId(), sysWechatCustomer, sysWechatCustomerDuties);
                 WxCpKfServiceStateResp serviceState;
                 try {
                     serviceState = wxCpKfService.getServiceState(wxCpKfMsgItem.getOpenKfid(), wxCpKfMsgItem.getExternalUserId());
@@ -104,7 +104,7 @@ public class WechatCustomerServiceImpl implements WechatCustomerService {
                     throw new RuntimeException(e);
                 }
                 Integer state1 = serviceState.getServiceState();
-                if (unanimous || !workingHours || !sysWechatCustomerDuties.isEmpty()) {
+                if (unanimous || !workingHours) {
                     if (state1 == 0) {
                         state1 = 1;
                         try {