From 2ae218e0bdecc7d8c159cf67f7f4e9f559e0ac6f Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 5 Jul 2024 18:12:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E9=A6=96=E5=85=85?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=B8=AD=E7=9A=84=E9=87=91=E9=A2=9D=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/PayNotifyLogic.php | 26 --------------------------
 app/common/logic/UserSignLogic.php  |  2 +-
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index c95933ca..4dac5898 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -447,32 +447,6 @@ class PayNotifyLogic extends BaseLogic
         bcscale(2);
 
         UserSignLogic::dealRechargeFrozen($user, $order, $order['user_ship']);
-        //写入对应得金额
-        if(in_array($order['pay_price'],['0.01','1000','2000','5000','10000'])){
-            switch ($order['pay_price']){
-                case 0.01:
-                case 1000:
-                    $total_vip = 249;
-                    break;
-                case 2000:
-                    $total_vip = 560;
-                    break;
-                case 5000:
-                    $total_vip = 1550;
-                    break;
-                case 10000:
-                    $total_vip = 3500;
-                    break;
-                default:
-                    $total_vip = 1;
-            }
-//            $total_vip = bcmul($order['pay_price'], 0.1, 2);
-            $write = UserSignLogic::write($order, $total_vip, 0, 0, 7);
-            UserSignLogic::write_log($write, $total_vip, 0, 7);
-
-            $write_get = UserSignLogic::write($order, $total_vip, 0, 1, 7);
-            UserSignLogic::write_log($write_get, $total_vip, 0, 7);
-        }
 
         //更新等级
         $user->user_ship = $order['user_ship'];
diff --git a/app/common/logic/UserSignLogic.php b/app/common/logic/UserSignLogic.php
index f8bc1858..f08302e7 100644
--- a/app/common/logic/UserSignLogic.php
+++ b/app/common/logic/UserSignLogic.php
@@ -43,7 +43,7 @@ class UserSignLogic extends BaseLogic
             return false;
         }
         $count = UserRecharge::where('uid', $order->uid)->count();
-        if ($count == 0 && in_array($user_ship, [1, 2, 3, 5, 6, 7, 8])) {
+        if ($count >=1 && in_array($user_ship, [1, 2, 3, 5, 6, 7, 8])) {
             //首充
             $write = self::write($order, $total_vip, 0, 1, 9);
             self::write_log($write, $total_vip, 0, 7);