From 3f75281438081911daa406f9ed55cd6e5465ae90 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 22 Jul 2024 16:14:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=AD=A3=E4=BA=86=E8=B4=AD?= =?UTF-8?q?=E7=89=A9=E8=BD=A6=E5=92=8C=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E4=BB=A3=E7=A0=81=E9=94=99=E8=AF=AF=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E4=BA=86=E9=9B=B6=E5=94=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E7=9A=84=E9=AA=8C=E8=AF=81=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/lists/order/CartList.php | 40 ++++++++++++++++-------------- app/api/lists/order/OrderList.php | 6 +++++ app/api/logic/order/OrderLogic.php | 5 ++++ 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/app/api/lists/order/CartList.php b/app/api/lists/order/CartList.php index c62e0d8a0..0e263cc74 100644 --- a/app/api/lists/order/CartList.php +++ b/app/api/lists/order/CartList.php @@ -65,23 +65,23 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists ->toArray(); $off_activity = Config::where('name', 'off_activity')->value('value'); $user_ship = User::where('id', $userId)->value('user_ship'); - $field='product_id,image,price,cost,store_name,unit,delete_time,vip_price,top_cate_id'; + $field = 'product_id,image,price,cost,store_name,unit,delete_time,vip_price,top_cate_id'; if (in_array($user_ship, [4, 6, 7])) { - $field='product_id,image,cost price,cost,store_name,unit,delete_time,vip_price,top_cate_id'; + $field = 'product_id,image,cost price,cost,store_name,unit,delete_time,vip_price,top_cate_id'; } - $this->user_ship=$user_ship; - $this->off_activity=$off_activity; + $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($field) ->withTrashed() ->find(); if ($find) { - if($off_activity==1){ - $this->activity_price = bcadd(bcmul($find['cost'],$item['cart_num'], 2), $this->activity_price, 2); + if ($off_activity == 1) { + $this->activity_price = bcadd(bcmul($find['cost'], $item['cart_num'], 2), $this->activity_price, 2); } if ($off_activity == 0 && $user_ship == 5 && $find['top_cate_id'] == 15189) { - $find['price']=$find['cost']; + $find['price'] = $find['cost']; } $item['goods_total_price'] = bcmul($item['cart_num'], $find['price'], 2); $this->total_price = bcadd($this->total_price, $item['goods_total_price'], 2); @@ -114,24 +114,28 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists public function extend() { - $data= [ + $data = [ 'off_activity' => $this->off_activity, 'total_price' => $this->total_price, 'msg' => '', 'pay_price' => $this->total_price ]; - if($this->user_ship==0){ - $data['msg']='您已选购满500元，支付成功后即可获得'.bcmul($this->total_price,0.1,2).'元品牌礼品兑换券,可到线下门店兑换礼品。'; + if ($this->user_ship == 0) { + if ($data['pay_price'] < 500) { + $data['msg'] = '还差' . bcsub(500, $this->activity_price, 2) . '即可获得10%的品牌礼品兑换券,可到线下门店兑换礼品。'; + } else { + $data['msg'] = '您已选购满500元，支付成功后即可获得' . bcmul($this->activity_price, 0.1, 2) . '元品牌礼品兑换券,可到线下门店兑换礼品。'; + } } - if($this->off_activity==1){//1 - $data['pay_price']=$this->activity_price; - if($this->activity_price<500){ - if($this->user_ship==0){ - $data['msg']='还差'.bcsub(500,$this->activity_price,2).'即可获得10%的品牌礼品兑换券,可到线下门店兑换礼品。'; + if ($this->off_activity == 1) { //1 + $data['pay_price'] = $this->activity_price; + if ($data['pay_price'] < 500) { + if ($this->user_ship == 0) { + $data['msg'] = '还差' . bcsub(500, $this->activity_price, 2) . '即可获得10%的品牌礼品兑换券,可到线下门店兑换礼品。'; } - }else{ - if($this->user_ship==0){ - $data['msg']= '您已选购满500元，支付成功后即可获得'.bcmul($this->activity_price,0.1,2).'元品牌礼品兑换券,可到线下门店兑换礼品。'; + } else { + if ($this->user_ship == 0) { + $data['msg'] = '您已选购满500元，支付成功后即可获得' . bcmul($this->activity_price, 0.1, 2) . '元品牌礼品兑换券,可到线下门店兑换礼品。'; } } } diff --git a/app/api/lists/order/OrderList.php b/app/api/lists/order/OrderList.php index f30f4e1f8..a17169c20 100644 --- a/app/api/lists/order/OrderList.php +++ b/app/api/lists/order/OrderList.php @@ -10,6 +10,7 @@ use app\common\model\store_order\StoreOrder; use app\common\model\store_order_cart_info\StoreOrderCartInfo; use app\common\model\store_product\StoreProduct; use app\common\model\store_product_unit\StoreProductUnit; +use Picqer\Barcode\BarcodeGeneratorPNG; /** * 零售订单列表 @@ -80,6 +81,11 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface if($item['verify_img']){ $item['verify_img'] = 'https://'.$this->request->host(true).$item['verify_img']; } + if($item['is_writeoff']==0){ + $generator = new BarcodeGeneratorPNG(); + $tmpFilename = $generator->getBarcode($item['verify_code'], $generator::TYPE_CODE_128); + $item['verify_base64'] = base64_encode($tmpFilename); + } }) ->toArray(); diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index a129b4b8c..9435d7f1d 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -506,6 +506,11 @@ class OrderLogic extends BaseLogic if ($find['verify_img']) { $find['verify_img'] = $url . $find['verify_img']; } + if($find['is_writeoff']==0){ + $generator = new BarcodeGeneratorPNG(); + $tmpFilename = $generator->getBarcode($find['verify_code'], $generator::TYPE_CODE_128); + $find['verify_base64'] = base64_encode($tmpFilename); + } //处理返回最近的店铺 if ($param['lat'] && $param['long']) { $storeAll = SystemStore::field('id,name,phone,address,detailed_address,latitude,longitude')->select()->toArray();