From 57f6cf0e3b85ee755fd4b81f891d1c09b29169ca Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 24 Jun 2024 18:04:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=86=E5=95=86?=
 =?UTF-8?q?=E5=BA=97=E6=8E=A7=E5=88=B6=E5=99=A8=E4=BB=A5=E4=BB=8E=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=A1=A8=E4=B8=AD=E8=8E=B7=E5=8F=96=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/store/StoreController.php              | 3 ++-
 app/store/controller/store_order/StoreOrderController.php | 6 ------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php
index 5aa96ccc9..a5c93465a 100644
--- a/app/api/controller/store/StoreController.php
+++ b/app/api/controller/store/StoreController.php
@@ -12,6 +12,7 @@ use app\api\validate\UserValidate;
 use app\common\enum\PayEnum;
 use app\common\logic\PaymentLogic;
 use app\common\logic\PayNotifyLogic;
+use app\common\model\Config;
 use app\common\model\user\User;
 use app\common\model\user_create_log\UserCreateLog;
 use app\common\model\user_recharge\UserRecharge;
@@ -80,7 +81,7 @@ class StoreController extends BaseApiController
             'uid'=>$find['id'],
             'staff_id'=>0,
             'order_id'=>getNewOrderId('CZ'),
-            'price'=>1000,
+            'price'=>Config::where('name','recharge')->value('value')??1000,
             'recharge_type'=>'INDUSTRYMEMBERS',
         ];
         $order = UserRecharge::create($data);
diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php
index fa80d2f0f..4b7295af4 100644
--- a/app/store/controller/store_order/StoreOrderController.php
+++ b/app/store/controller/store_order/StoreOrderController.php
@@ -345,12 +345,6 @@ class StoreOrderController extends BaseAdminController
      */
     public function rechange_amount()
     {
-        // $order = UserRecharge::where('order_id','CZ1719052252643357')->find();
-        // $order['pay_price'] = $order['price'];
-        // d(1);
-        // PayNotifyLogic::handle('recharge', $order['order_id'], $order);
-
-        // d(1);
         $pay_type = $this->request->post('pay_type');
         $auth_code = $this->request->post('auth_code'); //微信支付条码
         if ($auth_code == '' && $pay_type != PayEnum::CASH_PAY) {