Browse Source

订单状态分两种:1.status 本系统记录的订单状态 2. order_status 记录小程序回调返回的订单状态。这么做的目录是记录下小程序返回的订单状态

shizhongqi 11 tháng trước cách đây
mục cha
commit
91a5d2ce71

+ 10 - 8
app-hd/controllers/IntraCityController.php

@@ -612,31 +612,33 @@ class IntraCityController extends BaseController
             $orderStatus = intval($callbackData['order_status']);
             switch ($orderStatus) {
                 case IntraCityExpress::ORDER_STATUS_CREATED: // 订单创建成功
+                    $eo->order_status = 1;
                     $eo->status = 1;
                     break;
                 case IntraCityExpress::ORDER_STATUS_CANCELED_BY_MERCHANT: // 商家取消订单
-                    $eo->status = 2;
+                    $eo->order_status = 2;
                     break;
                 case IntraCityExpress::ORDER_STATUS_CANCELED_BY_DELIVERY: // 配送方取消订单
-                    $eo->status = 2;
+                    $eo->order_status = 3;
                     break;
                 case IntraCityExpress::ORDER_STATUS_ACCEPTED: // 配送员接单
-                    $eo->status = 3;
+                    $eo->order_status = 4;
                     break;
                 case IntraCityExpress::ORDER_STATUS_ARRIVED: // 配送员到店
-                    $eo->status = 4;
+                    $eo->order_status = 5;
                     break;
                 case IntraCityExpress::ORDER_STATUS_DELIVERING: // 配送中
-                    $eo->status = 5;
+                    $eo->order_status = 6;
                     break;
                 case IntraCityExpress::ORDER_STATUS_WITHDRAWN: // 配送员撤单
-                    $eo->status = 6;
+                    $eo->order_status = 7;
                     break;
                 case IntraCityExpress::ORDER_STATUS_COMPLETED: // 配送完成
-                    $eo->status = 7;
+                    $eo->order_status = 8;
+                    $eo->status = 2;
                     break;
                 case IntraCityExpress::ORDER_STATUS_EXCEPTION: // 配送异常
-                    $eo->status = 9;
+                    $eo->order_status = 9;
                     break;
             }
             $re = $eo->save();

+ 10 - 0
biz-hd/express/models/ExpressOrder.php

@@ -4,6 +4,16 @@ use bizHd\base\models\Base;
 
 class ExpressOrder extends Base
 {
+    // order_status -- 小程序返回的各订单状态
+    const ORDER_STATUS_CREATED = 1;                 // 订单创建成功
+    const ORDER_STATUS_CANCELED_BY_MERCHANT = 2;    // 商家取消订单
+    const ORDER_STATUS_CANCELED_BY_DELIVERY = 3;    // 配送方取消订单
+    const ORDER_STATUS_ACCEPTED = 4;       // 配送员接单
+    const ORDER_STATUS_ARRIVED = 5;        // 配送员到店
+    const ORDER_STATUS_DELIVERING = 6;     // 配送中
+    const ORDER_STATUS_WITHDRAWN = 7;      // 配送员撤单
+    const ORDER_STATUS_COMPLETED = 8;      // 配送完成
+    const ORDER_STATUS_EXCEPTION = 9;      // 配送异常
 
     public static function tableName()
     {