Commit a4b122c5 authored by liuyuzhen's avatar liuyuzhen

订单确认页面增加buyerMobile

parent bdda341b
...@@ -170,7 +170,7 @@ class CartController extends \Our\Controller_AbstractApi{ ...@@ -170,7 +170,7 @@ class CartController extends \Our\Controller_AbstractApi{
$storeCartData = $cartService->checkCouponForCart($storeCartData,$this->memberId); $storeCartData = $cartService->checkCouponForCart($storeCartData,$this->memberId);
//$this->success($storeCartData); //$this->success($storeCartData);
if(CURRENTVERSION==\Our\NameConst::versionOne){ if(CURRENTVERSION==\Our\NameConst::versionOne){
$storeCartData = $cartService->getDeliveryTypeForCartNew($address,$storeCartData); $storeCartData = $cartService->getDeliveryTypeForCartNew($address,$storeCartData,$this->memberId);
$data = $cartService->getFormatCartListForOrderNew($storeCartData,$address); $data = $cartService->getFormatCartListForOrderNew($storeCartData,$address);
}else{ }else{
$storeCartData = $cartService->getDeliveryTypeForCart($address,$storeCartData); $storeCartData = $cartService->getDeliveryTypeForCart($address,$storeCartData);
......
...@@ -663,10 +663,11 @@ class CartServiceModel extends \Business\AbstractModel{ ...@@ -663,10 +663,11 @@ class CartServiceModel extends \Business\AbstractModel{
* @param $address * @param $address
* @param $storeCartData * @param $storeCartData
*/ */
public function getDeliveryTypeForCartNew($address,$storeCartData,$dbName = \Our\DbNameConst::salveDBConnectName,$checkFlag = false){ public function getDeliveryTypeForCartNew($address,$storeCartData,$memberId,$dbName = \Our\DbNameConst::salveDBConnectName,$checkFlag = false){
$storeIds = $storeCartData['storeIds']; $storeIds = $storeCartData['storeIds'];
$storeDao = \DAO\StoreModel::getInstance(); $storeDao = \DAO\StoreModel::getInstance();
$deliveryFormulaDao = \DAO\DeliveryFormulaModel::getInstance($dbName); $deliveryFormulaDao = \DAO\DeliveryFormulaModel::getInstance($dbName);
$buyerMobile = \DAO\MemberModel::getInstance($dbName)->getInfo($memberId,'member_mobile');
foreach($storeIds as $storeId){ foreach($storeIds as $storeId){
$store = $storeDao->get($storeId,false); $store = $storeDao->get($storeId,false);
$storeCarts = $storeCartData['cartList'][$storeId]; $storeCarts = $storeCartData['cartList'][$storeId];
...@@ -692,7 +693,8 @@ class CartServiceModel extends \Business\AbstractModel{ ...@@ -692,7 +693,8 @@ class CartServiceModel extends \Business\AbstractModel{
'address' => ($store['store_address'].$store['store_subaddress']), 'address' => ($store['store_address'].$store['store_subaddress']),
'longitude' => $store['store_longitude'], 'longitude' => $store['store_longitude'],
'latitude' => $store['store_latitude'], 'latitude' => $store['store_latitude'],
'cityCode' => $store['store_citycode'] 'cityCode' => $store['store_citycode'],
'buyerMobile' => $buyerMobile
); );
if($deliverySetting['buyerDistribution']){ if($deliverySetting['buyerDistribution']){
$selfDeliveryTimeData = $deliveryFormulaDao->getBuyerFormulaForCart($store); $selfDeliveryTimeData = $deliveryFormulaDao->getBuyerFormulaForCart($store);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment