From 9082a73f806c570ad3322e53f4049474f588a423 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 5 Jul 2024 14:38:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8=E5=8F=8A=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F=E5=90=8E?=
 =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=9A=E5=91=98=E5=85=85=E5=80=BC=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E6=96=B9=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/PayController.php | 10 ++++++++--
 app/common/logic/UserSignLogic.php   | 16 ++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/api/controller/PayController.php b/app/api/controller/PayController.php
index 082f79306..b73ff3500 100644
--- a/app/api/controller/PayController.php
+++ b/app/api/controller/PayController.php
@@ -38,10 +38,13 @@ class PayController extends BaseApiController
                         $app->wechat->success();
                         break;
                     case 'wechat_common':
-                    default:
                         PayNotifyLogic::handle('wechat_common', $ciphertext['out_trade_no'], $ciphertext);
                         $app->wechat->success();
                         break;
+                    default:
+                        PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res);
+                        $app->wechat->success();
+                        break;
                 }
             }
         } else {
@@ -76,7 +79,7 @@ class PayController extends BaseApiController
         try {
             $res = $app->wechat->query($order);
         } catch (\Exception $e) {
-            return $this->fail($e->extra['message']);
+            return $this->fail($e->extra['message'] ?? $e->getMessage());
         }
         if ($res['trade_state'] == 'SUCCESS' && $res['trade_state_desc'] == '支付成功') {
             $attach = $res['attach'];
@@ -86,6 +89,9 @@ class PayController extends BaseApiController
                     $app->wechat->success();
                     break;
                 case 'wechat_common':
+                    PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res);
+                    $app->wechat->success();
+                    break;
                 default:
                     PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res);
                     $app->wechat->success();
diff --git a/app/common/logic/UserSignLogic.php b/app/common/logic/UserSignLogic.php
index 24a644dc7..bbea6d23a 100644
--- a/app/common/logic/UserSignLogic.php
+++ b/app/common/logic/UserSignLogic.php
@@ -22,17 +22,17 @@ class UserSignLogic extends BaseLogic
     public static function dealRechargeFrozen($user, $order, $user_ship = 0)
     {
         switch ($order['price']) {
-            case $order['price'] >= 1000 && $order['price'] < 2000:
-                $total_vip = bcmul($order['price'], 0.25, 2);
+            case 1000:
+                $total_vip = 249;
                 break;
-            case $order['price'] >= 2000 && $order['price'] < 5000:
-                $total_vip = bcmul($order['price'], 0.28, 2);
+            case 2000:
+                $total_vip = 560;
                 break;
-            case $order['price'] >= 5000 && $order['price'] < 10000:
-                $total_vip = bcmul($order['price'], 0.31, 2);
+            case 5000:
+                $total_vip = 1550;
                 break;
-            case $order['price'] >= 10000:
-                $total_vip = bcmul($order['price'], 0.35, 2);
+            case 10000:
+                $total_vip = 3500;
                 break;
             default:
                 $total_vip = 0;