From 970202fdc7ace23b707242b1694f4408e6b7601e Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 1 Jul 2024 12:01:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=86=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=94=AF=E4=BB=98=E9=80=BB=E8=BE=91=E5=92=8C=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/store/StoreController.php | 2 +- app/api/logic/order/OrderLogic.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index 698fe944c..61410d882 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -110,7 +110,7 @@ class StoreController extends BaseApiController $order['pay_price']=$order['price']; $result = PaymentLogic::codepay($auth_code, $order,'条码支付'); if (PaymentLogic::hasError()) { - return $this->fail(PaymentLogic::getError(), $params); + return $this->fail(PaymentLogic::getError()); } if (isset($result['trade_state_desc']) && $result['trade_state_desc'] == '支付成功') { PayNotifyLogic::handle('recharge', $result['out_trade_no'], $result); diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index b00605f3a..9ee898e05 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -103,7 +103,7 @@ class OrderLogic extends BaseLogic $cart_select[$k]['vip_price'] = bcmul($v['cart_num'], $find['vip_price'], 2) ?? 0; //vip售价 if($cart_select[$k]['total_price']>$cart_select[$k]['pay_price']){ - $deduction_price=bcsub($cart_select[$k]['total_price'],$find['deduction_price'],2); + $deduction_price=bcsub($cart_select[$k]['total_price'],$cart_select[$k]['pay_price'],2); $cart_select[$k]['deduction_price'] =$deduction_price;//抵扣金额 } $cart_select[$k]['product_id'] = $find['product_id'];