fix:验收格式

application/common/Enum/OrderEnum.php

@@ -106,9 +106,9 @@ class OrderEnum
         self::STATUS_AUTO_CANCEL => "已取消(系统)",
         self::STATUS_ADMIN_CANCEL => "已取消(管理员)",
         self::STATUS_INSPECTION => "待验货",
-        self::STATUS_INSPECTION_PASS => "验货通过",
+        self::STATUS_INSPECTION_PASS => "待发货",
         self::STATUS_INSPECTION_FAIL => "验货不通过",
-        self::STATUS_PAY => "待发货",
+        self::STATUS_PAY => "待验收",
         // self::STATUS_REFUND => "订单取消，退款中",
         // self::STATUS_REFUND_CONFIRM => "已退款",
         // self::STATUS_GROUPON_TIMEOUT => "已超时团购",

application/common/Service/OrderService.php

@@ -604,13 +604,13 @@ class OrderService
 
         $info = [];
         $info['unpay'] = Order::where('user_id', $userId)->where('order_status',OrderEnum::STATUS_CREATE)->count();
-        $info['unsend'] = Order::where('user_id', $userId)->where('order_status',OrderEnum::STATUS_PAY)->count();
+        $info['unsend'] = Order::where('user_id', $userId)->where('order_status',OrderEnum::STATUS_INSPECTION_PASS)->count();
         $info['unrec'] = Order::where('user_id', $userId)->where('order_status',OrderEnum::STATUS_SHIP)->count();
         $info['uneva'] = Order::where('user_id', $userId)->where('order_status',OrderEnum::STATUS_CONFIRM)->count();
         $info['inspect'] = Order::where('user_id', $userId)
         ->whereIn('order_status',[
+            OrderEnum::STATUS_PAY,
             OrderEnum::STATUS_INSPECTION,
-            OrderEnum::STATUS_INSPECTION_PASS,
             OrderEnum::STATUS_INSPECTION_FAIL])
             ->count();
        

application/common/service/OrderService.php

@@ -604,13 +604,13 @@ class OrderService
 
         $info = [];
         $info['unpay'] = Order::where('user_id', $userId)->where('order_status',OrderEnum::STATUS_CREATE)->count();
-        $info['unsend'] = Order::where('user_id', $userId)->where('order_status',OrderEnum::STATUS_PAY)->count();
+        $info['unsend'] = Order::where('user_id', $userId)->where('order_status',OrderEnum::STATUS_INSPECTION_PASS)->count();
         $info['unrec'] = Order::where('user_id', $userId)->where('order_status',OrderEnum::STATUS_SHIP)->count();
         $info['uneva'] = Order::where('user_id', $userId)->where('order_status',OrderEnum::STATUS_CONFIRM)->count();
         $info['inspect'] = Order::where('user_id', $userId)
         ->whereIn('order_status',[
+            OrderEnum::STATUS_PAY,
             OrderEnum::STATUS_INSPECTION,
-            OrderEnum::STATUS_INSPECTION_PASS,
             OrderEnum::STATUS_INSPECTION_FAIL])
             ->count();