From 63f05f69992c5f0081a3293fdfc648da7bdd8c1a Mon Sep 17 00:00:00 2001 From: devil Date: Mon, 10 Feb 2020 20:31:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8F=90=E4=BA=A4=E5=89=8D?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/BuyService.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/application/service/BuyService.php b/application/service/BuyService.php index 3c484f2ce..36bda954b 100755 --- a/application/service/BuyService.php +++ b/application/service/BuyService.php @@ -614,7 +614,7 @@ class BuyService // 站点模式 0销售, 2自提, 4销售+自提, 则其它正常模式 $common_site_type = MyC('common_site_type', 0, true); - $site_model = isset($params['site_model']) ? intval($params['site_model']) : 0; + $site_model = ($common_site_type == 4) ? (isset($params['site_model']) ? intval($params['site_model']) : 0) : $common_site_type; // 数据处理 $address = null; @@ -622,7 +622,7 @@ class BuyService // 站点模式 - 用户收货地址（未选择则取默认地址） // 销售, 销售+自提(指定为销售) - if($common_site_type == 0 || ($common_site_type == 4 && $site_model == 0)) + if($site_model == 0) { $address_params = [ 'user' => $params['user'], @@ -640,7 +640,7 @@ class BuyService // 自提模式 - 自提点地址 // 自提, 销售+自提(指定为自提) - if($common_site_type == 2 || ($common_site_type == 4 && $site_model == 2)) + if($site_model == 2) { $extraction = self::SiteExtractionAddress($params); if(!empty($extraction['data']['data_list'])) @@ -682,6 +682,9 @@ class BuyService // 自提地址列表 'extraction_address' => $extraction_address, + + // 站点模式 + 'site_model' => $site_model, ]; // 扩展展示数据