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

application/library/Order/OrderConfirmUtil.php

@@ -387,6 +387,7 @@ class OrderConfirmUtil {
             $delivery['deliveryFee'] = $deliveryFee;
             $delivery['deliveryType'] = $requestData['deliveryType'];
             $delivery['deliveryTime'] = isset($deliveryTime)?$deliveryTime:\Our\ApiConst::zero;
+            $delivery['needShippingFee'] = isset($temp['other'])?$temp['other']:\Our\ApiConst::zero;
             $storeCartData['cartList'][$storeId]['delivery'] = $delivery;
             if(($requestData['payway'] == \Our\ApiConst::payOnline&&$temp['onelinePay']==\Our\ApiConst::one)||
                 ($requestData['payway'] == \Our\ApiConst::payOffline&&$temp['offlinePay']==\Our\ApiConst::one)||
@@ -510,7 +511,15 @@ class OrderConfirmUtil {
             $order['store_name'] = $storeCarts['storeName'];
             $order['buyer_id'] = $this->memberId;
             $order['buyer_name'] = $this->member['memberName'];
-            $order['buyer_email'] = $this->member['memberEmail'];
+            if(CURRENTVERSION==\Our\NameConst::versionOne){
+                if($storeCarts['delivery']['deliveryType'] == \Our\ApiConst::deliveryBuyer){
+                    $order['buyer_email'] = $storeCarts['delivery']['buyerMobile'];
+                }else{
+                    $order['buyer_email'] = $this->address['mob_phone'];
+                }
+            }else{
+                $order['buyer_email'] = $this->member['memberEmail'];
+            }
             $order['add_time'] = TIMESTAMP;
             $order['payment_type'] = $storeCarts['payway'];
             $order['order_amount'] = $storeCarts['orderAmount'];
@@ -527,6 +536,7 @@ class OrderConfirmUtil {
                 $logMsg = \Our\DescribeConst::addNoPayOrderLog;
             }
             $order['shipping_fee'] = $storeCarts['delivery']['deliveryFee'];
+            $order['need_shipping_fee'] = isset($storeCarts['delivery']['needShippingFee'])?$storeCarts['delivery']['needShippingFee']:\Our\ApiConst::zero;
             $order['goods_amount'] = $storeCarts['storeTotalPrice'];
             $order['shipping_type'] = $storeCarts['delivery']['deliveryType'];
             if($storeCarts['delivery']['deliveryType'] == \Our\ApiConst::deliveryStore){

application/models/Business/Cart/CartService.php

@@ -734,6 +734,7 @@ class CartServiceModel extends \Business\AbstractModel{
                             $deliverySetting['deliverTimeList'] =$deliverTimeList['timeList'];
                             $storeCartData['cartList'][$storeId]['storeDistance'] = $storeDistance;
                             $deliverySetting['sellerDefaultFee'] = $deliverTimeList['default']?$deliverTimeList['default']:\Our\ApiConst::zero;
+                            $deliverySetting['other'] = $deliverTimeList['other']?$deliverTimeList['other']:\Our\ApiConst::zero;
                         }
                     }
                 }

application/models/Business/Order/OrderService.php

@@ -1082,7 +1082,9 @@ class OrderServiceModel extends \Business\AbstractModel
         $dlyoPickupCode = \Our\NameConst::emptyString;
         foreach ($orderList as $order) {
             $orderNos[] = $order['order_sn'];
-            $dlyoPickupCode = substr($order['order_sn'], ApiConst::positionPickupCodeBegin);
+            if($order['shipping_type']==\Our\ApiConst::bySelf){
+                $dlyoPickupCode = substr($order['order_sn'], ApiConst::positionPickupCodeBegin);
+            }
             if ($order['order_state'] == \Our\ApiConst::orderStateWaitPay) {
                 $orderTips = \Our\DescribeConst::payFailedTips;
                 $orderSubTips = \Our\DescribeConst::payFailedSubTips;

application/models/DAO/DeliveryFormula.php

@@ -297,7 +297,7 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
                 $dayList['list']= $value;
                 $returnList[] = $dayList;
             }
-            return array('timeList'=>$returnList,'default'=>$defaultFee);
+            return array('timeList'=>$returnList,'default'=>$defaultFee,'other'=>$formula['other']*\Our\ApiConst::hundred);
         }
         return $return;