1

ydd_mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/ExpressTaskServiceImpl.java

@@ -74,7 +74,7 @@ public class ExpressTaskServiceImpl implements ExpressTaskService {
         }else {
             //后续操作放入redis
             orderNoList.forEach(orderNo -> {
-                riderOrderService.addBalance(orderNo);
+//                riderOrderService.addBalance(orderNo);
             });
         }
     }

ydd_mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/RiderOrderServiceImpl.java

@@ -66,6 +66,8 @@ public class RiderOrderServiceImpl extends ServiceImpl<RiderOrderDao, RiderOrder
     private OrderStatusService orderStatusService;
     @Autowired
     private ExpressOrderService  expressOrderService;
+    @Autowired
+    private RiderOrderService riderOrderService;
 
     @Override
     public PageInfo<RiderOrderResponse> getAllPageList(RiderOrderSearchRequest request) {
@@ -272,7 +274,7 @@ public class RiderOrderServiceImpl extends ServiceImpl<RiderOrderDao, RiderOrder
             }else if(riderOrder.getOrderType().equals(1)){
                 updateExpressOrder(orderNo,OrderConstants.ORDER_STATUS_WAIT_RECEIPT);//客户待收件，待确认
             }
-
+            riderOrderService.addBalance(orderNo);
             return Boolean.TRUE;
         });
         if (!execute) throw new CrmebException("配送失败！");

ydd_mer_java/crmeb-service/src/main/resources/mapper/express/ExpressOrderMapper.xml

@@ -16,10 +16,10 @@
                 and o.paid = 0 and o.status = 0 and o.cancel_status = 0 and o.is_user_del = 0
             </when>
             <when test='status == "notShipped"'>
-                and o.status  in (1,2) and o.cancel_status = 0  and o.is_user_del = 0
+                and o.status  in (1) and o.cancel_status = 0  and o.is_user_del = 0
             </when>
             <when test='status == "spike"'>
-                and o.status in (3,4) and o.cancel_status = 0 and o.is_user_del = 0
+                and o.status in (2,3,4) and o.cancel_status = 0 and o.is_user_del = 0
             </when>
             <when test='status == "receiving"'>
                 and o.status = 5 and o.cancel_status = 0   and o.is_user_del = 0
@@ -80,13 +80,13 @@
                 and o.status  = 1 and o.cancel_status = 0  and o.is_user_del = 0
             </when>
             <when test='status == "spike"'>
-                and o.status in (2,3) and o.cancel_status = 0 and o.is_user_del = 0
+                and o.status in (2,3,4) and o.cancel_status = 0 and o.is_user_del = 0
             </when>
             <when test='status == "receiving"'>
-                and o.status = 4 and o.cancel_status = 0   and o.is_user_del = 0
+                and o.status = 5 and o.cancel_status = 0   and o.is_user_del = 0
             </when>
             <when test='status == "complete"'>
-                and o.status = 5
+                and o.status = 6
             </when>
             <when test='status == "refunded"'>
                 and o.paid = 1 and o.cancel_status = 0  and o.is_user_del = 0