|
|
@@ -237,7 +237,10 @@ class WorkController extends BaseController
|
|
|
WorkClass::finish($work);
|
|
|
$transaction->commit();
|
|
|
|
|
|
- WorkClass::print($work, $this->shop, false);
|
|
|
+ //情人节美团的暂时不打小票
|
|
|
+ if ($work->fromType != 4) {
|
|
|
+ WorkClass::print($work, $this->shop, false);
|
|
|
+ }
|
|
|
|
|
|
$msg = '已完成';
|
|
|
|
|
|
@@ -258,17 +261,17 @@ class WorkController extends BaseController
|
|
|
$thirdOrderId = $order->thirdOrderId ?? '';
|
|
|
$fromType = $order->fromType ?? 0;
|
|
|
if (!empty($thirdOrderId) && $fromType == dict::getDict('fromType', 'mt')) {
|
|
|
- $shopId = $order->shopId ?? 0;
|
|
|
- $ext = ShopExtClass::getByCondition(['shopId' => $shopId], true);
|
|
|
- $config = dict::getDict('mtConfig');
|
|
|
- $app = new Application($config);
|
|
|
- $accessToken = mtUtil::getAccessToken($ext);
|
|
|
- $params = ['order_id' => $thirdOrderId, 'access_token' => $accessToken];
|
|
|
- $mtRes = $app->order->logisticsPush($params);
|
|
|
- $mtRes = json_decode($mtRes, true);
|
|
|
- if (isset($mtRes['data']) && $mtRes['data'] == 'ok') {
|
|
|
- $msg = '已完成,已通知骑手';
|
|
|
- }
|
|
|
+// $shopId = $order->shopId ?? 0;
|
|
|
+// $ext = ShopExtClass::getByCondition(['shopId' => $shopId], true);
|
|
|
+// $config = dict::getDict('mtConfig');
|
|
|
+// $app = new Application($config);
|
|
|
+// $accessToken = mtUtil::getAccessToken($ext);
|
|
|
+// $params = ['order_id' => $thirdOrderId, 'access_token' => $accessToken];
|
|
|
+// $mtRes = $app->order->logisticsPush($params);
|
|
|
+// $mtRes = json_decode($mtRes, true);
|
|
|
+// if (isset($mtRes['data']) && $mtRes['data'] == 'ok') {
|
|
|
+// $msg = '已完成,已通知骑手';
|
|
|
+// }
|
|
|
}
|
|
|
}
|
|
|
}
|