diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index adc00994..253436c9 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 7f50e6ea..5896de4e 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) {