Merge branch 'master' of git.huaml.com:zhh/huahuibao

app-ghs/controllers/IntraCityController.php

@@ -300,7 +300,7 @@ class IntraCityController extends BaseController
 
         $result = IntraCityExpress::preAddOrder($orderData);
         if ($result['errcode'] === 0) {
-            util::success($result, "运费查询成功");
+            util::success($result, "查询成功");
         } else {
             Yii::error("运费查询失败：" . json_encode($result));
             util::fail('运费查询失败' . json_encode($result));

app-hd/controllers/IntraCityController.php

@@ -309,7 +309,7 @@ class IntraCityController extends BaseController
 
         $result = IntraCityExpress::preAddOrder($orderData);
         if ($result['errcode'] === 0) {
-            util::success($result, "运费查询成功");
+            util::success($result, "查询成功");
         } else {
             Yii::error("运费查询失败：" . json_encode($result));
             util::fail('运费查询失败' . json_encode($result));
@@ -615,7 +615,7 @@ class IntraCityController extends BaseController
             $result = IntraCityExpress::cancelOrder($wxOrderId, $storeOrderId, $wxStoreId);
             if (isset($result['errcode']) && $result['errcode'] === 0) {
                 // 更新订单状态
-                OrderClass::updateById($orderId, ['sendStatus' => OrderClass::ORDER_STATUS_CANCEL]);//设置为取消状态
+                OrderClass::updateById($orderId, ['sendStatus' => OrderClass::SEND_STATUS_CANCEL]);//设置为取消状态
                 $eo = ExpressOrderClass::getByCondition(['storeOrderId' => $storeOrderId, 'wxStoreId' => $wxStoreId], true);
                 if (!empty($eo)) {
                     $eo->status = ExpressOrder::STATUS_CANCELED;

app-mall/controllers/OrderController.php

@@ -94,7 +94,7 @@ class OrderController extends BaseController
 
         $result = IntraCityExpress::preAddOrder($orderData);
         if ($result['errcode'] === 0) {
-            util::success($result, "运费查询成功");
+            util::success($result, "查询成功");
         } else {
             Yii::error("运费查询失败：" . json_encode($result));
             util::fail('运费查询失败' . json_encode($result));

biz-hd/order/classes/OrderClass.php

@@ -44,6 +44,7 @@ class OrderClass extends BaseClass
 
     public static $baseFile = '\bizHd\order\models\Order';
 
+    // todo 注意这个是订单的状态
     //已退款
     const ORDER_HAD_REFUND = 6;
     //已取消
@@ -57,6 +58,7 @@ class OrderClass extends BaseClass
     //待付款
     const ORDER_STATUS_UN_PAY = 1;
 
+    // todo 注意这个是配送单的状态
     const SEND_STATUS_UNSEND = 0; //未发货
     const SEND_STATUS_SENDING = 1; //已发货（配送中）
     const SEND_STATUS_COMPLETED = 2; //已送达