Commit ceeca93b authored by liuyuzhen's avatar liuyuzhen

下单相关修改

parent eb556ff9
...@@ -605,9 +605,15 @@ class CartServiceModel extends \Business\AbstractModel{ ...@@ -605,9 +605,15 @@ class CartServiceModel extends \Business\AbstractModel{
$storeCarts = $storeCartData['cartList'][$storeId]; $storeCarts = $storeCartData['cartList'][$storeId];
$deliverySetting['onelinePay'] = $store['wx_pay'];//是否支持线上支付 $deliverySetting['onelinePay'] = $store['wx_pay'];//是否支持线上支付
$deliverySetting['offlinePay'] = $store['offline_pay']; $deliverySetting['offlinePay'] = $store['offline_pay'];
if($deliverySetting['offlinePay']){ if($deliverySetting['offlinePay']){
if(\Our\Common::isSerialized($store['offline_payway'])){
$paywayArray = unserialize($store['offline_payway']);
$deliverySetting['offlinePayway'] = $paywayArray['payway'];
}else{
$deliverySetting['offlinePayway'] = $store['offline_payway']; $deliverySetting['offlinePayway'] = $store['offline_payway'];
} }
}
$deliverySetting['aogPay'] = $store['aog_pay']; $deliverySetting['aogPay'] = $store['aog_pay'];
$deliverySetting['buyerDistribution'] = $store['buyer_distribution']; $deliverySetting['buyerDistribution'] = $store['buyer_distribution'];
$deliverySetting['sellerDistribution'] = $store['seller_distribution']; $deliverySetting['sellerDistribution'] = $store['seller_distribution'];
...@@ -668,6 +674,9 @@ class CartServiceModel extends \Business\AbstractModel{ ...@@ -668,6 +674,9 @@ class CartServiceModel extends \Business\AbstractModel{
$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'); $buyerMobile = \DAO\MemberModel::getInstance($dbName)->getInfo($memberId,'member_mobile');
if($buyerMobile&&!\Our\Common::checkMobilePhone($buyerMobile)){
$buyerMobile=\Our\NameConst::emptyString;
}
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];
......
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