需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -152,7 +152,7 @@ public class WorkerManagerLogic {
     public void update(WorkerManagerBean workerManagerBean) {
         workerManagerBean.setCreateTime(null);
         if (workerManagerBean.getExamineStatus().equals(ExamineWorkerStatusEnum.OK.getKey())) {
-            if (workerPolicyService.lambdaQuery().eq(WorkerPolicy::getStatus, WorkerPolicyStatusEnum.BZZ).eq(WorkerPolicy::getWebsitUserId,workerManagerBean.getUserId())
+            if (workerPolicyService.lambdaQuery().eq(WorkerPolicy::getStatus, WorkerPolicyStatusEnum.BZZ.getKey()).eq(WorkerPolicy::getWebsitUserId,workerManagerBean.getUserId())
                     .count() < 2) {
                 workerManagerBean.setExamineStatus(ExamineWorkerStatusEnum.WAIT_WORKER.getKey());
             }else {

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -323,7 +323,7 @@
             and a.order_status = #{ex.orderStatus.key}
         </if>
         <if test="ex.orderStatus != null and ex.orderStatus.key =='YCD'.toString()">
-            and a.is_exception =1 and a.order_status NOT IN ('YWG','YJS')
+            and a.is_exception =1 and a.order_status NOT IN ('YWG','YWGO','YJS')
         </if>
         <if test="ex.orderStatus != null and ex.orderStatus.key =='DYY'.toString()">
             and a.appointment_time is null and a.order_status in('DYY','DSHPG','DWDPG','DJD')