From 21b36295d9cf80085ef6417516623eca14ec44ce Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 9 Jul 2024 17:04:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=BF=90=E8=B4=B9=E5=92=8C=E4=BC=98=E6=83=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/lists/order/CartList.php | 17 +++++++++++++---- app/api/lists/product/ProductLists.php | 25 ++++++------------------- app/api/logic/order/OrderLogic.php | 8 ++------ 3 files changed, 21 insertions(+), 29 deletions(-) diff --git a/app/api/lists/order/CartList.php b/app/api/lists/order/CartList.php index 0191ffcaf..273ea8af1 100644 --- a/app/api/lists/order/CartList.php +++ b/app/api/lists/order/CartList.php @@ -25,6 +25,7 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists protected $total_price = 0; protected $activity_price = 0; protected $off_activity = 0; + protected $user_ship = 0; /** @@ -63,11 +64,12 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists }) ->toArray(); $off_activity = Config::where('name', 'off_activity')->value('value'); - $this->off_activity=$off_activity; $user_ship = User::where('id', $userId)->value('user_ship'); if (in_array($user_ship, [4, 5, 6, 7])) { $off_activity=1; } + $this->user_ship=$user_ship; + $this->off_activity=$off_activity; foreach ($list as $key => &$item) { $find = StoreBranchProduct::where(['product_id' => $item['product_id'], 'store_id' => $item['store_id']]) ->field('product_id,image,price,cost,store_name,unit,delete_time,vip_price') @@ -112,17 +114,24 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists $data= [ 'off_activity' => $this->off_activity, 'total_price' => $this->total_price, - 'msg' => '您已选购满500元，支付成功后即可获得'.bcmul($this->total_price,0.1,2).'元品牌礼品兑换券,可到线下门店兑换礼品。', + 'msg' => '', 'pay_price' => $this->total_price ]; + if($this->user_ship==0){ + $data['msg']='您已选购满500元，支付成功后即可获得'.bcmul($this->total_price,0.1,2).'元品牌礼品兑换券,可到线下门店兑换礼品。'; + } if($this->off_activity==0){//1 $this->activity_price = $this->total_price; $data['pay_price']=$this->activity_price; if($this->activity_price<500){ - $data['msg']='还差'.bcsub(500,$this->activity_price,2).'即可获得10%的品牌礼品兑换券,可到线下门店兑换礼品。'; + if($this->user_ship==0){ + $data['msg']='还差'.bcsub(500,$this->activity_price,2).'即可获得10%的品牌礼品兑换券,可到线下门店兑换礼品。'; + } $data['pay_price']= $this->activity_price; }else{ - $data['msg']= '您已选购满500元，支付成功后即可获得'.bcmul($this->activity_price,0.1,2).'元品牌礼品兑换券,可到线下门店兑换礼品。'; + if($this->user_ship==0){ + $data['msg']= '您已选购满500元，支付成功后即可获得'.bcmul($this->activity_price,0.1,2).'元品牌礼品兑换券,可到线下门店兑换礼品。'; + } } } return $data; diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php index b13a60509..1cb4ad67a 100644 --- a/app/api/lists/product/ProductLists.php +++ b/app/api/lists/product/ProductLists.php @@ -23,7 +23,8 @@ use think\facade\Db; */ class ProductLists extends BaseApiDataLists implements ListsSearchInterface, ListsSortInterface, ListsExtendInterface { - + protected $off_activity = 0; + protected $user_ship = 0; /** * @notes 设置搜索条件 @@ -79,7 +80,8 @@ class ProductLists extends BaseApiDataLists implements ListsSearchInterface, Lis $order = [$field => $order]; } $fields = 'id,product_id,cate_id,store_name,cost,store_id,vip_price,purchase,price,bar_code,image,sales,store_info,delete_time,unit,batch,top_cate_id,two_cate_id,stock'; - + $off_activity = Config::where('name', 'off_activity')->value('value'); + $this->off_activity = $off_activity; $this->searchWhere[] = ['status', '=', 1]; // $this->searchWhere[] = ['stock', '>', 0]; return StoreBranchProduct::where($this->searchWhere) @@ -107,27 +109,12 @@ class ProductLists extends BaseApiDataLists implements ListsSearchInterface, Lis { $price = 'price'; $op_price = 'price'; - $off_activity = 0; - $uid=0; - if($this->request->get('uid')){ - $uid=$this->request->get('uid'); - }elseif($this->userId>0){ - $uid=$this->userId; - } - if ($uid > 0) { - $user_ship = User::where('id', $uid)->value('user_ship'); - if (in_array($user_ship, [4, 5, 6, 7])) { - $price = 'cost'; - $op_price = 'price'; - } - } - $off_activity = Config::where('name', 'off_activity')->value('value'); - if ($off_activity == 1) { + if ($this->off_activity == 1) { $price = 'cost'; $op_price = 'price'; } $data = [ - 'off_activity' => $off_activity, + 'off_activity' => $this->off_activity, 'price' => $price, 'op_price' => $op_price, ]; diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 90a54d109..1d9557a51 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -94,14 +94,10 @@ class OrderLogic extends BaseLogic } unset($cart_select[$k]['id']); $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价 - if ($off_activity == 1) { + if ($off_activity == 1 || in_array($user['user_ship'], [4, 5, 6, 7])) { $price = $find['cost']; } else { - if ($user && in_array($user['user_ship'], [4, 5, 6, 7])) { - $price = $find['cost']; - } else { - $price = $find['price']; - } + $price = $find['price']; } $cart_select[$k]['price'] = $price; $cart_select[$k]['cost'] = $find['cost'];