1.订单状态统一使用常量 2.零售下单付款后，订单状态设置为：已付款(待配送)

app-hd/controllers/IntraCityController.php

@@ -647,28 +647,28 @@ class IntraCityController extends BaseController
                     $eo->order_status = ExpressOrder::ORDER_STATUS_CREATED;
                     $eo->status = ExpressOrder::STATUS_CREATED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 配送中|已发货
-                    OrderClass::updateById($storeOrderId, ['status'=>3, 'sendStatus'=>1]);
+                    OrderClass::updateById($storeOrderId, ['status'=>OrderClass::ORDER_STATUS_SENDING, 'sendStatus'=>OrderClass::SEND_STATUS_SENDING]);
                     break;
                 case IntraCityExpress::ORDER_STATUS_CANCELED_BY_MERCHANT: // 商家取消订单
                     $eo->order_status = ExpressOrder::ORDER_STATUS_CANCELED_BY_MERCHANT;
-                    // 更新 xhOrder 表的订单状态与配送状态 -- 待配送|未发货
-                    OrderClass::updateById($storeOrderId, ['status'=>2, 'sendStatus'=>0]);
+                    // 更新 xhOrder 表的订单状态与配送状态 -- 待配送|取消
+                    OrderClass::updateById($storeOrderId, ['status'=>OrderClass::ORDER_STATUS_UN_SEND, 'sendStatus'=>OrderClass::SEND_STATUS_CANCEL]);
                     break;
                 case IntraCityExpress::ORDER_STATUS_CANCELED_BY_DELIVERY: // 配送方取消订单
                     $eo->order_status = ExpressOrder::ORDER_STATUS_CANCELED_BY_DELIVERY;
                     $eo->status = ExpressOrder::STATUS_CANCELED;
-                    // 更新 xhOrder 表的订单状态与配送状态 -- 待配送|未发货
-                    OrderClass::updateById($storeOrderId, ['status'=>2, 'sendStatus'=>0]);
+                    // 更新 xhOrder 表的订单状态与配送状态 -- 待配送|取消
+                    OrderClass::updateById($storeOrderId, ['status'=>OrderClass::ORDER_STATUS_UN_SEND, 'sendStatus'=>OrderClass::SEND_STATUS_CANCEL]);
                     break;
                 case IntraCityExpress::ORDER_STATUS_ACCEPTED: // 配送员接单
                     $eo->order_status = ExpressOrder::ORDER_STATUS_ACCEPTED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 配送中|已发货
-                    OrderClass::updateById($storeOrderId, ['status'=>3, 'sendStatus'=>1]); //订单创建时已执行了，这儿重复更新
+                    OrderClass::updateById($storeOrderId, ['status'=>OrderClass::ORDER_STATUS_SENDING, 'sendStatus'=>OrderClass::SEND_STATUS_SENDING]); //订单创建时已执行了，这儿重复更新
                     break;
                 case IntraCityExpress::ORDER_STATUS_ARRIVED: // 配送员到店
                     $eo->order_status = ExpressOrder::ORDER_STATUS_ARRIVED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 配送中|已发货
-                    OrderClass::updateById($storeOrderId, ['status'=>3, 'sendStatus'=>1]); //订单创建时已执行了，这儿重复更新
+                    OrderClass::updateById($storeOrderId, ['status'=>OrderClass::ORDER_STATUS_SENDING, 'sendStatus'=>OrderClass::SEND_STATUS_SENDING]); //订单创建时已执行了，这儿重复更新
                     break;
                 case IntraCityExpress::ORDER_STATUS_DELIVERING: // 配送中
                     $eo->order_status = ExpressOrder::ORDER_STATUS_DELIVERING;
@@ -676,13 +676,13 @@ class IntraCityController extends BaseController
                 case IntraCityExpress::ORDER_STATUS_WITHDRAWN: // 配送员撤单
                     $eo->order_status = ExpressOrder::ORDER_STATUS_WITHDRAWN;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 待配送|未发货
-                    OrderClass::updateById($storeOrderId, ['status'=>2, 'sendStatus'=>0]);
+                    OrderClass::updateById($storeOrderId, ['status'=>OrderClass::ORDER_STATUS_UN_SEND, 'sendStatus'=>OrderClass::SEND_STATUS_UNSEND]);
                     break;
                 case IntraCityExpress::ORDER_STATUS_COMPLETED: // 配送完成
                     $eo->order_status = ExpressOrder::ORDER_STATUS_COMPLETED;
                     $eo->status = ExpressOrder::STATUS_COMPLETED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 已完成|已送达
-                    OrderClass::updateById($storeOrderId, ['status'=>4, 'sendStatus'=>2]);
+                    OrderClass::updateById($storeOrderId, ['status'=>OrderClass::ORDER_STATUS_COMPLETE, 'sendStatus'=>OrderClass::SEND_STATUS_COMPLETED]);
                     break;
                 case IntraCityExpress::ORDER_STATUS_EXCEPTION: // 配送异常
                     $eo->order_status = ExpressOrder::ORDER_STATUS_EXCEPTION;

app-hd/controllers/NoticeController.php

@@ -3,21 +3,18 @@
 namespace hd\controllers;
 
 use biz\shop\classes\ShopClass;
-use biz\notice\classes\NoticeClass;
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\custom\classes\CustomRechargeClass;
 use bizGhs\order\classes\OrderClearClass;
 use bizGhs\order\classes\RefundOrderClass;
 use bizHd\cg\classes\CgRefundClass;
 use bizHd\ghs\classes\GhsClass;
-use bizHd\ljh\classes\LjhApplyClass;
 use bizHd\purchase\classes\PurchaseClass;
 use bizHd\purchase\classes\PurchaseClearClass;
 use bizHd\wx\classes\WxOpenClass;
 use common\components\dict;
 use common\components\noticeUtil;
 use common\components\payUtil;
-use common\components\sms;
 use Yii;
 use common\components\util;
 use biz\wx\classes\WxMessageClass;

biz-hd/order/classes/OrderClass.php

@@ -57,6 +57,11 @@ class OrderClass extends BaseClass
     //待付款
     const ORDER_STATUS_UN_PAY = 1;
 
+    const SEND_STATUS_UNSEND    = 0; //未发货
+    const SEND_STATUS_SENDING   = 1; //已发货（配送中）
+    const SEND_STATUS_COMPLETED = 2; //已送达
+    const SEND_STATUS_CANCEL    = 3; //取消
+
     //订单总流程数
     const ORDER_TOTAL_FLOW = 4;
 
@@ -435,12 +440,7 @@ class OrderClass extends BaseClass
 
         $orderId = $order->id ?? 0;
         $customId = $order->customId ?? 0;
-        if ($order->fromType == 3) {
-            //客服下的单要配送流程
-            $order->status = self::ORDER_STATUS_UN_SEND;
-        } else {
-            $order->status = self::ORDER_STATUS_COMPLETE;
-        }
+        $order->status = self::ORDER_STATUS_UN_SEND; // 付款后，订单状态设置为：已付款(待配送)
         $order->payWay = $payWay;
         $order->payStatus = 1;
         $order->payTime = date("Y-m-d H:i:s");