配送订单状态常量化

app-hd/controllers/IntraCityController.php

@@ -3,6 +3,7 @@
 namespace hd\controllers;
 
 use bizHd\express\classes\ExpressOrderClass;
+use bizHd\express\models\ExpressOrder;
 use bizHd\goods\classes\GoodsClass;
 use bizHd\order\classes\OrderClass;
 use bizHd\order\classes\OrderGoodsClass;
@@ -503,7 +504,7 @@ class IntraCityController extends BaseController
                 OrderClass::updateById($storeOrderId, ['sendStatus'=>3]);//设置为取消状态
                 $eo = ExpressOrderClass::getByCondition(['storeOrderId'=>$storeOrderId, 'wxStoreId'=>$wxStoreId], true);
                 if(!empty($eo)) {
-                    $eo->status = 3;
+                    $eo->status = ExpressOrder::STATUS_CANCELED;
                     $eo->cancelTime = date('Y-m-d H:i:s');
                     $eo->deductfee = $result['deductfee'];
                     $eo->save();
@@ -612,33 +613,33 @@ class IntraCityController extends BaseController
             $orderStatus = intval($callbackData['order_status']);
             switch ($orderStatus) {
                 case IntraCityExpress::ORDER_STATUS_CREATED: // 订单创建成功
-                    $eo->order_status = 1;
-                    $eo->status = 1;
+                    $eo->order_status = ExpressOrder::ORDER_STATUS_CREATED;
+                    $eo->status = ExpressOrder::STATUS_CREATED;
                     break;
                 case IntraCityExpress::ORDER_STATUS_CANCELED_BY_MERCHANT: // 商家取消订单
-                    $eo->order_status = 2;
+                    $eo->order_status = ExpressOrder::ORDER_STATUS_CANCELED_BY_MERCHANT;
                     break;
                 case IntraCityExpress::ORDER_STATUS_CANCELED_BY_DELIVERY: // 配送方取消订单
-                    $eo->order_status = 3;
+                    $eo->order_status = ExpressOrder::ORDER_STATUS_CANCELED_BY_DELIVERY;
                     break;
                 case IntraCityExpress::ORDER_STATUS_ACCEPTED: // 配送员接单
-                    $eo->order_status = 4;
+                    $eo->order_status = ExpressOrder::ORDER_STATUS_ACCEPTED;
                     break;
                 case IntraCityExpress::ORDER_STATUS_ARRIVED: // 配送员到店
-                    $eo->order_status = 5;
+                    $eo->order_status = ExpressOrder::ORDER_STATUS_ARRIVED;
                     break;
                 case IntraCityExpress::ORDER_STATUS_DELIVERING: // 配送中
-                    $eo->order_status = 6;
+                    $eo->order_status = ExpressOrder::ORDER_STATUS_DELIVERING;
                     break;
                 case IntraCityExpress::ORDER_STATUS_WITHDRAWN: // 配送员撤单
-                    $eo->order_status = 7;
+                    $eo->order_status = ExpressOrder::ORDER_STATUS_WITHDRAWN;
                     break;
                 case IntraCityExpress::ORDER_STATUS_COMPLETED: // 配送完成
-                    $eo->order_status = 8;
-                    $eo->status = 2;
+                    $eo->order_status = ExpressOrder::ORDER_STATUS_COMPLETED;
+                    $eo->status = ExpressOrder::STATUS_COMPLETED;
                     break;
                 case IntraCityExpress::ORDER_STATUS_EXCEPTION: // 配送异常
-                    $eo->order_status = 9;
+                    $eo->order_status = ExpressOrder::ORDER_STATUS_EXCEPTION;
                     break;
             }
             $re = $eo->save();

biz-hd/express/models/ExpressOrder.php

@@ -15,6 +15,11 @@ class ExpressOrder extends Base
     const ORDER_STATUS_COMPLETED = 8;      // 配送完成
     const ORDER_STATUS_EXCEPTION = 9;      // 配送异常
 
+    // status -- 本系统记录的订单状态
+    const STATUS_CREATED = 1; // 配送中
+    const STATUS_COMPLETED = 2; // 完成
+    const STATUS_CANCELED = 3; // 取消
+
     public static function tableName()
     {
         return 'xhExpressOrder';