运费

app-ghs/controllers/OrderController.php

@@ -327,9 +327,13 @@ class OrderController extends BaseController
                 //售卖价格
                 $itemPrice = $productData[$productId]['price'] ?? 0;
                 //合计价格
-                $price = bcadd($price,bcmul($itemNum, $itemPrice, 2),2);
+                $price = bcadd($price, bcmul($itemNum, $itemPrice, 2), 2);
             }
-            $cost = freight::getCost($shop->lat,$shop->long,$customInfo['lat'],$customInfo['long'],$weight);
+            //没有经纬度的客户运费直接返回空 shish 20210612
+            if (empty($customInfo['lat']) || empty($customInfo['long'])) {
+                util::success(['sedCost' => '']);
+            }
+            $cost = freight::getCost($shop->lat, $shop->long, $customInfo['lat'], $customInfo['long'], $weight);
             util::success(['sedCost' => $cost]);
         }
         $province = $get['province'] ?? '';
@@ -345,7 +349,7 @@ class OrderController extends BaseController
         if (empty($lat) || empty($lng) || empty($fullAddress)) {
             util::fail('请完善客户地址');
         }
-        ini_set('date.timezone','Asia/Shanghai');
+        ini_set('date.timezone', 'Asia/Shanghai');
         if (!empty($sendTime)) {
             //配送时间不为空
             // 预约发单时间（预约时间unix时间戳(10位),精确到分;整分钟为间隔，并且需要至少提前5分钟预约
@@ -356,16 +360,16 @@ class OrderController extends BaseController
             if ($diff <= 360) {
                 util::fail('配送时间至少提前6分钟');
             }
-        }else{
+        } else {
             //默认立即发送
             $sendTime = 0;
         }
         //更新订单表
         $info = OrderService::getOrderInfo($orderId);
         OrderClass::valid($info, $this->shopId);
-        if($sendTime){
-            $sendTime =date('Y-m-d H:i', strtotime($sendTime));
-        }else{
+        if ($sendTime) {
+            $sendTime = date('Y-m-d H:i', strtotime($sendTime));
+        } else {
             $sendTime = '0000-00-00 00:00:00';
         }
         $expressAddInfo = [
@@ -377,7 +381,7 @@ class OrderController extends BaseController
             'floor' => $floor,
             'lat' => $lat,
             'long' => $lng,
-            'sendTime' =>$sendTime,
+            'sendTime' => $sendTime,
         ];
         OrderClass::updateCustomExpressInfo($orderId, $expressAddInfo);
         //计算运费