检查到大量bug, 修复提交

app-ghs/controllers/IntraCityController.php

@@ -6,11 +6,11 @@ use bizHd\express\classes\ExpressOrderClass;
 use bizHd\express\models\ExpressOrder;
 use bizHd\order\classes\OrderGoodsClass;
 use bizHd\user\classes\UserClass;
+use bizHd\order\classes\OrderItemClass;
 use hd\models\IntraCity\StoreFeeForm;
 // 以上类来自零售端
 
 use bizGhs\order\classes\OrderClass;
-use bizGhs\order\classes\OrderItemClass;
 use biz\shop\classes\MainClass;
 use biz\shop\classes\ShopClass;
 use common\components\noticeUtil;
@@ -65,7 +65,7 @@ class IntraCityController extends BaseController
             }
 
             // 创建门店前，检查是否已经 开通门店权限 (有wxStoreId，即说明开通了)
-            $shopExt = MainClass::getById($this->mainId, true, false, 'id, wxStoreId');
+            $shopExt = MainClass::getById($this->mainId, true, 'id, wxStoreId');
 
             // 查询是否存在 wx_store_id，不存在则执行apply
             if ($shopExt->wxStoreId == '') {
@@ -103,7 +103,7 @@ class IntraCityController extends BaseController
     {
         $shopId = $this->shopId;
         // 首先从门店扩展表查询是否已经创建
-        $shopExt = MainClass::getById($this->mainId, true, false, 'id, wxStoreId');
+        $shopExt = MainClass::getById($this->mainId, true, 'id, wxStoreId');
         if ($shopExt->wxStoreId == '') { // 不存在，则从微信接口查询
             $result = IntraCityExpress::getStore($this->mainId);
             if ($result['errcode'] === 0) {
@@ -131,7 +131,7 @@ class IntraCityController extends BaseController
     public function actionUpdateStore()
     {
         // 首先从门店扩展表查询是否已经创建
-        $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+        $shopExt = MainClass::getById($this->mainId, false, 'id, wxStoreId');
         if ($shopExt['wxStoreId'] == '') {
             util::fail('未创建门店，请先创建');
         }
@@ -186,7 +186,7 @@ class IntraCityController extends BaseController
             util::fail('快递动力ID出错');
         }
 
-        $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+        $shopExt = MainClass::getById($this->mainId, false, 'id, wxStoreId');
         if ($shopExt['wxStoreId'] == '') {
             util::fail('微信门店编号为空');
         }
@@ -205,7 +205,7 @@ class IntraCityController extends BaseController
      */
     public function actionStoreBalance()
     {
-        $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+        $shopExt = MainClass::getById($this->mainId, false, 'id, wxStoreId');
         if ($shopExt['wxStoreId'] == '') {
             util::error(-1,'微信门店编号为空');
         }
@@ -254,7 +254,7 @@ class IntraCityController extends BaseController
         if (empty($shopId)) {
             util::fail("门店不存在");
         }
-        $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+        $shopExt = MainClass::getById($this->mainId, false, 'id, wxStoreId');
         if (empty($shopExt)) {
             util::fail("微信门店不存在");
         }
@@ -354,7 +354,7 @@ class IntraCityController extends BaseController
                 $post['packageNum'] = $itemCount;
             }
 
-            $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+            $shopExt = MainClass::getById($this->mainId, false, 'id, wxStoreId');
             if (empty($shopExt)) {
                 util::fail("微信门店不存在");
             }
@@ -444,7 +444,7 @@ class IntraCityController extends BaseController
             } else {
                 noticeUtil::push("门店 -- " . $this->mainId . "，订单创建失败：" . json_encode($result));
                 Yii::error("订单创建失败：" . ($result['errmsg'] ?? '未知错误'), 'intracity');
-                util::fail($result['errmsg'] ?? '订单创建失败', $result['errcode'] ?? -1);
+                util::fail( '订单创建失败: ' . $result['errcode']);
             }
         } catch (\Exception $e) {
             Yii::error("订单创建异常：" . $e->getMessage(), 'intracity');
@@ -459,7 +459,7 @@ class IntraCityController extends BaseController
     public function actionGetOrder()
     {
         try {
-            $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+            $shopExt = MainClass::getById($this->mainId, false, 'id, wxStoreId');
             if (empty($shopExt)) {
                 util::fail("微信门店不存在");
             }
@@ -502,7 +502,7 @@ class IntraCityController extends BaseController
                 util::success("查询成功", $result);
             } else {
                 Yii::error("订单查询失败：" . ($result['errmsg'] ?? '未知错误'), 'intracity');
-                util::fail($result['errmsg'] ?? '订单查询失败', $result['errcode'] ?? -1);
+                util::fail( '订单查询失败: ' . $result['errcode']);
             }
         } catch (\Exception $e) {
             Yii::error("订单查询异常：" . $e->getMessage(), 'intracity');
@@ -519,7 +519,7 @@ class IntraCityController extends BaseController
         try {
             $post = Yii::$app->request->post();
 
-            $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+            $shopExt = MainClass::getById($this->mainId, false, 'id, wxStoreId');
             if (empty($shopExt)) {
                 util::fail("微信门店不存在");
             }
@@ -581,7 +581,7 @@ class IntraCityController extends BaseController
                 }
 
                 Yii::error("订单取消失败：" . ($result['errmsg'] ?? '未知错误'), 'intracity');
-                util::fail($result['errmsg'] ?? '订单取消失败', $result['errcode'] ?? -1);
+                util::fail('订单取消失败: ' . $result['errcode']);
             }
         } catch (\Exception $e) {
             Yii::error("订单取消异常：" . $e->getMessage(), 'intracity');
@@ -647,7 +647,7 @@ class IntraCityController extends BaseController
             switch ($orderStatus) {
                 // 订单创建成功
                 case IntraCityExpress::ORDER_STATUS_CREATED:
-                    $eo->order_status = ExpressOrder::ORDER_STATUS_CREATED;
+                    $eo->orderStatus = ExpressOrder::ORDER_STATUS_CREATED;
                     $eo->status = ExpressOrder::STATUS_CREATED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 配送中|已发货
                     OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_SENDING, 'sendStatus' => OrderClass::SEND_STATUS_SENDING]);
@@ -655,14 +655,14 @@ class IntraCityController extends BaseController
 
                 // 商家取消订单
                 case IntraCityExpress::ORDER_STATUS_CANCELED_BY_MERCHANT:
-                    $eo->order_status = ExpressOrder::ORDER_STATUS_CANCELED_BY_MERCHANT;
+                    $eo->orderStatus = ExpressOrder::ORDER_STATUS_CANCELED_BY_MERCHANT;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 待配送|取消
                     OrderClass::updateById($orderId, ['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->orderStatus = ExpressOrder::ORDER_STATUS_CANCELED_BY_DELIVERY;
                     $eo->status = ExpressOrder::STATUS_CANCELED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 待配送|取消
                     OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_UN_SEND, 'sendStatus' => OrderClass::SEND_STATUS_CANCEL]);
@@ -670,33 +670,33 @@ class IntraCityController extends BaseController
 
                 // 配送员接单
                 case IntraCityExpress::ORDER_STATUS_ACCEPTED:
-                    $eo->order_status = ExpressOrder::ORDER_STATUS_ACCEPTED;
+                    $eo->orderStatus = ExpressOrder::ORDER_STATUS_ACCEPTED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 配送中|已发货
                     OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_SENDING, 'sendStatus' => OrderClass::SEND_STATUS_SENDING]); //订单创建时已执行了，这儿重复更新
                     break;
 
                 // 配送员到店
                 case IntraCityExpress::ORDER_STATUS_ARRIVED:
-                    $eo->order_status = ExpressOrder::ORDER_STATUS_ARRIVED;
+                    $eo->orderStatus = ExpressOrder::ORDER_STATUS_ARRIVED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 配送中|已发货
                     OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_SENDING, 'sendStatus' => OrderClass::SEND_STATUS_SENDING]); //订单创建时已执行了，这儿重复更新
                     break;
 
                 // 配送中
                 case IntraCityExpress::ORDER_STATUS_DELIVERING:
-                    $eo->order_status = ExpressOrder::ORDER_STATUS_DELIVERING;
+                    $eo->orderStatus = ExpressOrder::ORDER_STATUS_DELIVERING;
                     break;
 
                 // 配送员撤单
                 case IntraCityExpress::ORDER_STATUS_WITHDRAWN:
-                    $eo->order_status = ExpressOrder::ORDER_STATUS_WITHDRAWN;
+                    $eo->orderStatus = ExpressOrder::ORDER_STATUS_WITHDRAWN;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 待配送|未发货
                     OrderClass::updateById($orderId, ['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->orderStatus = ExpressOrder::ORDER_STATUS_COMPLETED;
                     $eo->status = ExpressOrder::STATUS_COMPLETED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 已完成|已送达
                     OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_COMPLETE, 'sendStatus' => OrderClass::SEND_STATUS_COMPLETED]);
@@ -704,7 +704,7 @@ class IntraCityController extends BaseController
 
                 // 配送异常
                 case IntraCityExpress::ORDER_STATUS_EXCEPTION:
-                    $eo->order_status = ExpressOrder::ORDER_STATUS_EXCEPTION;
+                    $eo->orderStatus = ExpressOrder::ORDER_STATUS_EXCEPTION;
                     noticeUtil::push('同城配送异常 --- store_order_id(orderId):' . $storeOrderId . '，wx_store_id:' . $wxStoreId);
                     break;
             }

app-hd/controllers/IntraCityController.php

@@ -64,7 +64,7 @@ class IntraCityController extends BaseController
 
             // 创建门店前，检查是否已经 开通门店权限 (有wxStoreId，即说明开通了)
             //$shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], true, false, 'id, wxStoreId');
-            $shopExt = MainClass::getById($this->mainId, true, false, 'id, wxStoreId');
+            $shopExt = MainClass::getById($this->mainId, true, 'id, wxStoreId');
 
             // 查询是否存在 wx_store_id，不存在则执行apply
             if ($shopExt->wxStoreId == '') {
@@ -103,7 +103,7 @@ class IntraCityController extends BaseController
         $shopId = $this->shopId;
         // 首先从门店扩展表查询是否已经创建
         //$shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], true, false, 'id, wxStoreId');
-        $shopExt = MainClass::getById($this->mainId, true, false, 'id, wxStoreId');
+        $shopExt = MainClass::getById($this->mainId, true, 'id, wxStoreId');
         if ($shopExt->wxStoreId == '') { // 不存在，则从微信接口查询
             $result = IntraCityExpress::getStore($this->mainId);
             if ($result['errcode'] === 0) {
@@ -132,7 +132,7 @@ class IntraCityController extends BaseController
     {
         // 首先从门店扩展表查询是否已经创建
         //$shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], false, false, 'id, wxStoreId');
-        $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+        $shopExt = MainClass::getById($this->mainId, false, 'id, wxStoreId');
         if ($shopExt['wxStoreId'] == '') {
             util::fail('未创建门店，请先创建');
         }
@@ -189,7 +189,7 @@ class IntraCityController extends BaseController
         }
 
         //$shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], false, false, 'id, wxStoreId');
-        $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+        $shopExt = MainClass::getById($this->mainId, false, 'id, wxStoreId');
         if ($shopExt['wxStoreId'] == '') {
             util::fail('微信门店编号为空');
         }
@@ -208,9 +208,8 @@ class IntraCityController extends BaseController
      */
     public function actionStoreBalance()
     {
-        $shopId = $this->shopId;
         //$shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], false, false, 'id, wxStoreId');
-        $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+        $shopExt = MainClass::getById($this->mainId, false, 'id, wxStoreId');
         if ($shopExt['wxStoreId'] == '') {
             util::fail('微信门店编号为空');
         }
@@ -260,7 +259,7 @@ class IntraCityController extends BaseController
             util::fail("门店不存在");
         }
         //$shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], false, false, 'id, wxStoreId');
-        $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+        $shopExt = MainClass::getById($this->mainId, false, 'id, wxStoreId');
         if (empty($shopExt)) {
             util::fail("微信门店不存在");
         }
@@ -361,7 +360,7 @@ class IntraCityController extends BaseController
             }
 
             //$shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], false, false, 'id, wxStoreId');
-            $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+            $shopExt = MainClass::getById($this->mainId, false, 'id, wxStoreId');
             if (empty($shopExt)) {
                 util::fail("微信门店不存在");
             }
@@ -467,7 +466,7 @@ class IntraCityController extends BaseController
     {
         try {
             //$shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], false, false, 'id, wxStoreId');
-            $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+            $shopExt = MainClass::getById($this->mainId, false, 'id, wxStoreId');
             if (empty($shopExt)) {
                 util::fail("微信门店不存在");
             }
@@ -510,7 +509,7 @@ class IntraCityController extends BaseController
                 util::success("查询成功", $result);
             } else {
                 Yii::error("订单查询失败：" . ($result['errmsg'] ?? '未知错误'), 'intracity');
-                util::fail($result['errmsg'] ?? '订单查询失败', $result['errcode'] ?? -1);
+                util::fail('订单查询失败: ' . $result['errcode']);
             }
         } catch (\Exception $e) {
             Yii::error("订单查询异常：" . $e->getMessage(), 'intracity');
@@ -529,7 +528,7 @@ class IntraCityController extends BaseController
 
 
             //$shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], false, false, 'id, wxStoreId');
-            $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+            $shopExt = MainClass::getById($this->mainId, false, 'id, wxStoreId');
             if (empty($shopExt)) {
                 util::fail("微信门店不存在");
             }
@@ -591,7 +590,7 @@ class IntraCityController extends BaseController
                 }
 
                 Yii::error("订单取消失败：" . ($result['errmsg'] ?? '未知错误'), 'intracity');
-                util::fail($result['errmsg'] ?? '订单取消失败', $result['errcode'] ?? -1);
+                util::fail('订单取消失败: ' . $result['errcode']);
             }
         } catch (\Exception $e) {
             Yii::error("订单取消异常：" . $e->getMessage(), 'intracity');
@@ -657,7 +656,7 @@ class IntraCityController extends BaseController
             switch ($orderStatus) {
                 // 订单创建成功
                 case IntraCityExpress::ORDER_STATUS_CREATED:
-                    $eo->order_status = ExpressOrder::ORDER_STATUS_CREATED;
+                    $eo->orderStatus = ExpressOrder::ORDER_STATUS_CREATED;
                     $eo->status = ExpressOrder::STATUS_CREATED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 配送中|已发货
                     OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_SENDING, 'sendStatus' => OrderClass::SEND_STATUS_SENDING]);
@@ -665,14 +664,14 @@ class IntraCityController extends BaseController
 
                 // 商家取消订单
                 case IntraCityExpress::ORDER_STATUS_CANCELED_BY_MERCHANT:
-                    $eo->order_status = ExpressOrder::ORDER_STATUS_CANCELED_BY_MERCHANT;
+                    $eo->orderStatus = ExpressOrder::ORDER_STATUS_CANCELED_BY_MERCHANT;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 待配送|取消
                     OrderClass::updateById($orderId, ['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->orderStatus = ExpressOrder::ORDER_STATUS_CANCELED_BY_DELIVERY;
                     $eo->status = ExpressOrder::STATUS_CANCELED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 待配送|取消
                     OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_UN_SEND, 'sendStatus' => OrderClass::SEND_STATUS_CANCEL]);
@@ -680,33 +679,33 @@ class IntraCityController extends BaseController
 
                 // 配送员接单
                 case IntraCityExpress::ORDER_STATUS_ACCEPTED:
-                    $eo->order_status = ExpressOrder::ORDER_STATUS_ACCEPTED;
+                    $eo->orderStatus = ExpressOrder::ORDER_STATUS_ACCEPTED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 配送中|已发货
                     OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_SENDING, 'sendStatus' => OrderClass::SEND_STATUS_SENDING]); //订单创建时已执行了，这儿重复更新
                     break;
 
                 // 配送员到店
                 case IntraCityExpress::ORDER_STATUS_ARRIVED:
-                    $eo->order_status = ExpressOrder::ORDER_STATUS_ARRIVED;
+                    $eo->orderStatus = ExpressOrder::ORDER_STATUS_ARRIVED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 配送中|已发货
                     OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_SENDING, 'sendStatus' => OrderClass::SEND_STATUS_SENDING]); //订单创建时已执行了，这儿重复更新
                     break;
 
                 // 配送中
                 case IntraCityExpress::ORDER_STATUS_DELIVERING:
-                    $eo->order_status = ExpressOrder::ORDER_STATUS_DELIVERING;
+                    $eo->orderStatus = ExpressOrder::ORDER_STATUS_DELIVERING;
                     break;
 
                 // 配送员撤单
                 case IntraCityExpress::ORDER_STATUS_WITHDRAWN:
-                    $eo->order_status = ExpressOrder::ORDER_STATUS_WITHDRAWN;
+                    $eo->orderStatus = ExpressOrder::ORDER_STATUS_WITHDRAWN;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 待配送|未发货
                     OrderClass::updateById($orderId, ['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->orderStatus = ExpressOrder::ORDER_STATUS_COMPLETED;
                     $eo->status = ExpressOrder::STATUS_COMPLETED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 已完成|已送达
                     OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_COMPLETE, 'sendStatus' => OrderClass::SEND_STATUS_COMPLETED]);
@@ -714,7 +713,7 @@ class IntraCityController extends BaseController
 
                 // 配送异常
                 case IntraCityExpress::ORDER_STATUS_EXCEPTION:
-                    $eo->order_status = ExpressOrder::ORDER_STATUS_EXCEPTION;
+                    $eo->orderStatus = ExpressOrder::ORDER_STATUS_EXCEPTION;
                     noticeUtil::push('同城配送异常 --- store_order_id(orderId):' . $storeOrderId . '，wx_store_id:' . $wxStoreId);
                     break;
             }

biz-ghs/order/classes/OrderClass.php

@@ -82,12 +82,11 @@ class OrderClass extends BaseClass
     //已付款
     const PAY_STATUS_HAS_PAY = 1;
 
-    //待配送
-    const SEND_STATUS_UN_SEND = 1;
-    //配送中
-    const SEND_STATUS_SENDING = 2;
-    //配送完成
-    const SEND_STATUS_COMPLETE = 3;
+
+    const SEND_STATUS_UNSEND = 0; //未发货
+    const SEND_STATUS_SENDING = 1; //已发货（配送中）
+    const SEND_STATUS_COMPLETED = 2; //已送达
+    const SEND_STATUS_CANCEL = 3; //取消
 
 
     //订单总流程数