From 1eb395bbe0c230f2c57d41f98bb77e7a8e807f72 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 17 Jun 2024 10:51:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=86=E8=AE=A2?= =?UTF-8?q?=E5=8D=95API=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E9=80=9A=E7=9F=A5=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 | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index adc00994b..253436c97 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -56,7 +56,7 @@ class StoreController extends BaseApiController 'uid'=>$find['uid'], 'staff_id'=>0, 'order_id'=>getNewOrderId('CZ'), - 'price'=>$params['price'], + 'price'=>1000, ]; $order = UserRecharge::create($data); diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 7f50e6ea2..5896de4e4 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -8,6 +8,7 @@ use app\common\enum\UserShipEnum; use app\common\enum\YesNoEnum; use app\common\logic\BaseLogic; use app\common\logic\CapitalFlowLogic; +use app\common\logic\PayNotifyLogic; use app\common\logic\StoreFinanceFlowLogic; use app\common\model\dict\DictData; use app\common\model\dict\DictType; @@ -399,11 +400,13 @@ class OrderLogic extends BaseLogic 'staff_id' => $params['staff_id']??0, 'update_time' => time(), ], ['oid' => $data['id']]); - $financeFlow = (new StoreFinanceFlowLogic)->getStoreOrder($data['id'], $data['store_id']); - if (!empty($financeFlow)) { - $capitalFlowLogic = new CapitalFlowLogic($data->store, 'store'); - $capitalFlowLogic->storeIncome('store_order_income', 'order', $data['id'], $financeFlow['number']); - } + // $financeFlow = (new StoreFinanceFlowLogic)->getStoreOrder($data['id'], $data['store_id']); + // if (!empty($financeFlow)) { + // $capitalFlowLogic = new CapitalFlowLogic($data->store, 'store'); + // $capitalFlowLogic->storeIncome('store_order_income', 'order', $data['id'], $financeFlow['number']); + // } + $order=StoreOrder::where('id',$data['id'])->find(); + PayNotifyLogic::afterPay($order); Db::commit(); return true; } catch (\Exception $e) {