Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/library/Order/OrderConfirmUtil.php

@@ -336,6 +336,7 @@ class OrderConfirmUtil {
         $currentTime = time();
         $todayTime = strtotime(date('Y-m-d',time()));
         $tomorrowTime = $todayTime + \Our\ApiConst::oneDaySecond;
+
         foreach($storeCartData['cartList'] as $storeId=>$tempStore){
             $temp = $tempStore['deliverySetting'];
             if(isset($this->postData['storeId'])&&$this->postData['storeId']){
@@ -343,6 +344,7 @@ class OrderConfirmUtil {
             }else{
                 $requestData = $this->postFormatData[$storeId];
             }
+            $deliveryTime = $requestData['deliveryTime'];
             if($requestData['deliveryType'] == \Our\ApiConst::deliveryStore){//商家配送
                 if($temp['sellerDistribution']!=\Our\ApiConst::one){
                     \Error\ErrorModel::throwException(\Error\CodeConfigModel::noStoreDeliveryTypeForOrder);
@@ -380,6 +382,8 @@ class OrderConfirmUtil {
             if($deliveryFee!=$requestData['deliveryFee']){
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::wrongStoreDeliveryFeeForOrder);
             }
+            $delivery = array();
+            $delivery['buyerMobile'] = isset($requestData['buyerMobile'])?$requestData['buyerMobile']:\Our\NameConst::emptyString;
             $delivery['deliveryFee'] = $deliveryFee;
             $delivery['deliveryType'] = $requestData['deliveryType'];
             $delivery['deliveryTime'] = isset($deliveryTime)?$deliveryTime:\Our\ApiConst::zero;
@@ -528,6 +532,8 @@ class OrderConfirmUtil {
             if($storeCarts['delivery']['deliveryType'] == \Our\ApiConst::deliveryStore){
                 $order['delivery_distance'] = $storeCarts['storeDistance'];
                 $order['delivery_time'] = $storeCarts['delivery']['deliveryTime'];
+            }else if($storeCarts['delivery']['deliveryType'] == \Our\ApiConst::deliveryBuyer){
+                $order['delivery_time'] = $storeCarts['delivery']['deliveryTime'];
             }
             if(isset($storeCarts['couponId'])){
                 $order['coupon_id'] = $storeCarts['couponId'];