shish 1 سال پیش
والد
کامیت
8bd29134a4
3فایلهای تغییر یافته به همراه20 افزوده شده و 7 حذف شده
  1. 1 2
      app-hd/controllers/ExpressController.php
  2. 18 4
      app-hd/controllers/IntraCityController.php
  3. 1 1
      biz/wx/classes/WxMessageClass.php

+ 1 - 2
app-hd/controllers/ExpressController.php

@@ -105,8 +105,7 @@ class ExpressController extends BaseController
         if (!empty($es)) {
             util::success($es, "查询成功");
         } else {
-            Yii::error("配送订单查询失败");
-            util::fail('配送订单查询失败');
+            util::complete();
         }
     }
 }

+ 18 - 4
app-hd/controllers/IntraCityController.php

@@ -9,6 +9,8 @@ use bizHd\order\classes\OrderGoodsClass;
 use bizHd\order\classes\OrderItemClass;
 use bizHd\shop\classes\MainClass;
 use bizHd\user\classes\UserClass;
+use bizHd\wx\classes\WxOpenClass;
+use common\components\dict;
 use common\components\noticeUtil;
 use common\components\util;
 use hd\models\IntraCity\StoreFeeForm;
@@ -710,7 +712,7 @@ class IntraCityController extends BaseController
                     $eo->orderStatus = ExpressOrder::ORDER_STATUS_CANCELED_BY_MERCHANT;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 待配送|取消
                     OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_UN_SEND, 'sendStatus' => OrderClass::SEND_STATUS_CANCEL]);
-                    $msg = '您有订单已取消配送(订单编号:';
+                    $msg = '取消配送,订单编号:';
                     break;
 
                 // 配送方取消订单
@@ -719,7 +721,7 @@ class IntraCityController extends BaseController
                     $eo->status = ExpressOrder::STATUS_CANCELED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 待配送|取消
                     OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_UN_SEND, 'sendStatus' => OrderClass::SEND_STATUS_CANCEL]);
-                    $msg = '您有订单被配送方取消(订单编号:';
+                    $msg = '配送方取消配送,订单编号:';
                     break;
 
                 // 配送员接单
@@ -746,7 +748,7 @@ class IntraCityController extends BaseController
                     $eo->orderStatus = ExpressOrder::ORDER_STATUS_WITHDRAWN;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 待配送|未发货
                     OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_UN_SEND, 'sendStatus' => OrderClass::SEND_STATUS_UNSEND]);
-                    $msg = '您有订单被配送员取消(订单编号:';
+                    $msg = '跑腿取消配送,订单编号:';
                     break;
 
                 // 配送完成
@@ -763,7 +765,7 @@ class IntraCityController extends BaseController
                     noticeUtil::push('同城配送异常 --- store_order_id(orderId):' . $storeOrderId . ',wx_store_id:' . $wxStoreId);
                     // 更新 xhOrder 表的订单状态与配送状态 -- 待配送|未发货
                     OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_UN_SEND, 'sendStatus' => OrderClass::SEND_STATUS_UNSEND]);
-                    $msg = '您有订单配送出现异常(订单编号:';
+                    $msg = '订单配送异常,订单编号:';
                     break;
             }
 
@@ -789,4 +791,16 @@ class IntraCityController extends BaseController
         }
     }
 
+    //模拟接口回调 ssh 20250826
+    public function actionMockNotify()
+    {
+        $post = Yii::$app->request->post();
+        $orderStatus = $post['orderStatus'] ?? 0;
+        $wxOrderId = $post['wxOrderId'] ?? '';
+        $ptStyle = dict::getDict('ptStyle', 'hd');
+        $merchant = WxOpenClass::getWxInfo();
+        $ret = IntraCityExpress::mockNotify($orderStatus, $wxOrderId, '', '', $merchant, $ptStyle);
+        print_r($ret);
+    }
+
 }

+ 1 - 1
biz/wx/classes/WxMessageClass.php

@@ -119,7 +119,7 @@ class WxMessageClass extends BaseClass
                 "url" => Yii::$app->params['ghsDomain'],
                 "data" => [
                     "first" => ["value" => $result, "color" => "#173177"],
-                    "keyword1" => ["value" => "【{$result}】", "color" => "#173177"],
+                    "keyword1" => ["value" => $result, "color" => "#173177"],
                     "keyword2" => ["value" => $customName . '的订单', "color" => "#173177"],
                     "remark" => ["value" => '点击查看详情', "color" => "#173177"]
                 ]