|
|
@@ -84,7 +84,7 @@ class IntraCityController extends BaseController
|
|
|
$shopExt->wxStoreId = $result['wx_store_id'];
|
|
|
$shopExt->save();
|
|
|
|
|
|
- util::success("门店创建成功", $result);
|
|
|
+ util::success($result, "门店创建成功");
|
|
|
} else {
|
|
|
Yii::error("门店创建失败:" . $result['errmsg']);
|
|
|
util::fail($result['errmsg']);
|
|
|
@@ -446,7 +446,7 @@ class IntraCityController extends BaseController
|
|
|
];
|
|
|
ExpressOrderClass::add($orderData);
|
|
|
|
|
|
- util::success('订单创建成功', ['fee' => $result['fee']]);
|
|
|
+ util::success(['fee' => $result['fee']], '订单创建成功');
|
|
|
} else {
|
|
|
noticeUtil::push("门店 -- " . $this->mainId . ",订单创建失败:" . json_encode($result));
|
|
|
Yii::error("订单创建失败:" . ($result['errmsg'] ?? '未知错误'), 'intracity');
|
|
|
@@ -474,7 +474,8 @@ class IntraCityController extends BaseController
|
|
|
$post = Yii::$app->request->post();
|
|
|
$wxOrderId = isset($post['wx_order_id']) ? $post['wx_order_id'] : '';
|
|
|
$orderId = $post['orderId'];
|
|
|
- $wxStoreId = isset($post['wx_store_id']) ? $post['wx_order_id'] : $shopExt['wxStoreId'];
|
|
|
+ //$wxStoreId = isset($post['wx_store_id']) ? $post['wx_order_id'] : $shopExt['wxStoreId'];
|
|
|
+ $wxStoreId = isset($post['wx_store_id']) ? $post['wx_store_id'] : $shopExt['wxStoreId'];
|
|
|
|
|
|
if (empty($wxOrderId) && (empty($orderId) || empty($wxStoreId))) {
|
|
|
util::fail("参数不足:wx_order_id 或 (order_id + wx_store_id) 必须提供一组");
|
|
|
@@ -506,7 +507,7 @@ class IntraCityController extends BaseController
|
|
|
|
|
|
$result = IntraCityExpress::queryOrder($wxStoreId, $storeOrderId, $wxOrderId);
|
|
|
if (isset($result['errcode']) && $result['errcode'] === 0) {
|
|
|
- util::success("查询成功", $result);
|
|
|
+ util::success($result, "查询成功");
|
|
|
} else {
|
|
|
Yii::error("订单查询失败:" . ($result['errmsg'] ?? '未知错误'), 'intracity');
|
|
|
util::fail('订单查询失败: ' . $result['errcode']);
|
|
|
@@ -535,7 +536,8 @@ class IntraCityController extends BaseController
|
|
|
|
|
|
$wxOrderId = isset($post['wx_order_id']) ? $post['wx_order_id'] : '';
|
|
|
$orderId = $post['orderId']; //配送订单创建成功后,也会返回的 store_order_id。 即 orderId
|
|
|
- $wxStoreId = isset($post['wx_store_id']) ? $post['wx_order_id'] : $shopExt['wxStoreId'];
|
|
|
+ //$wxStoreId = isset($post['wx_store_id']) ? $post['wx_order_id'] : $shopExt['wxStoreId'];
|
|
|
+ $wxStoreId = isset($post['wx_store_id']) ? $post['wx_store_id'] : $shopExt['wxStoreId'];
|
|
|
if (empty($wxOrderId) && (empty($orderId) || empty($wxStoreId))) {
|
|
|
util::fail("参数不足:wx_order_id 或 (store_order_id + wx_store_id) 必须提供一组");
|
|
|
}
|
|
|
@@ -581,12 +583,12 @@ class IntraCityController extends BaseController
|
|
|
$eo->save();
|
|
|
}
|
|
|
|
|
|
- util::success("订单取消成功", $result);
|
|
|
+ util::success($result, "订单取消成功");
|
|
|
} else {
|
|
|
if ($result['errcode'] == 934018) { // 93401 -- 订单已取消,请勿重复操作
|
|
|
// 更新订单状态
|
|
|
OrderClass::updateById($orderId, ['sendStatus' => OrderClass::ORDER_STATUS_CANCEL]);//设置为取消状态
|
|
|
- util::success("订单取消成功", $result);
|
|
|
+ util::success($result, "订单取消成功");
|
|
|
}
|
|
|
|
|
|
Yii::error("订单取消失败:" . ($result['errmsg'] ?? '未知错误'), 'intracity');
|