|
|
@@ -315,10 +315,10 @@ class OrderController extends BaseController
|
|
|
|
|
|
//不能前端传运费过来，只能通过跑腿接口计算出来
|
|
|
unset($post['sendCost']);
|
|
|
- if (isset($post['sendType']) && $post['sendType'] == 2) {
|
|
|
|
|
|
- $mapSet = ShopClass::hasIntraCity($this->shop);
|
|
|
- $openIntraCity = $mapSet['openIntraCity'] ?? 0;
|
|
|
+ $mapSet = ShopClass::hasIntraCity($this->shop);
|
|
|
+ $openIntraCity = $mapSet['openIntraCity'] ?? 0;
|
|
|
+ if (isset($post['sendType']) && $post['sendType'] == 2 && $openIntraCity != 0) {
|
|
|
if ($openIntraCity == 2) {
|
|
|
util::fail('不能使用跑腿');
|
|
|
}
|
|
|
@@ -531,11 +531,7 @@ class OrderController extends BaseController
|
|
|
$mapSet = ShopClass::hasIntraCity($shop);
|
|
|
$openIntraCity = $mapSet['openIntraCity'] ?? 0;
|
|
|
|
|
|
- if($openIntraCity == 2){
|
|
|
- util::fail('不能使用跑腿');
|
|
|
- }
|
|
|
-
|
|
|
- if ($sendType == dict::getDict('sendType', 'thirdSend') && $openIntraCity == 1) {
|
|
|
+ if ($sendType == dict::getDict('sendType', 'thirdSend') && $openIntraCity != 0) {
|
|
|
// if (dict::getDict('hasMap') == 0) {
|
|
|
// util::fail('不能使用跑腿，请选其它方式');
|
|
|
// }
|
|
|
@@ -617,6 +613,10 @@ class OrderController extends BaseController
|
|
|
// }
|
|
|
// noticeUtil::push("零售订单！获取运费：{$sendCost} 重量：{$totalWeight} 距离：{$sendDistance} 姓名：{$customName} 手机号 {$customMobile} 经纬 {$originalLng} {$originalLat} 金额：{$goodsPrice} 数量：{$goodsNum}", '15280215347');
|
|
|
|
|
|
+ if($openIntraCity == 2){
|
|
|
+ util::fail('不能使用跑腿');
|
|
|
+ }
|
|
|
+
|
|
|
$cutomInfo = [
|
|
|
'name' => $post['receiveUserName'],
|
|
|
'mobile' => $post['receiveMobile'],
|
