From 194db4c3df3b4bc5841646b8406d0ff6b80bf320 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 27 Jun 2024 14:21:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=E5=92=8C=E4=BD=99=E9=A2=9D=E6=A0=B8=E9=94=80?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/user/UserLogic.php           | 1 -
 app/api/controller/store/StoreController.php | 1 -
 app/common/logic/PayNotifyLogic.php          | 7 ++++++-
 app/common/logic/StoreFinanceFlowLogic.php   | 7 +++++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php
index 7a6f7e8a6..3d02c5872 100644
--- a/app/admin/logic/user/UserLogic.php
+++ b/app/admin/logic/user/UserLogic.php
@@ -89,7 +89,6 @@ class UserLogic extends BaseLogic
                 'account' => $params['mobile'],
                 'password' => $password,
                 'mobile' => $params['mobile'],
-                'user_ship' => $params['user_ship']??0,
                 'label_id' => $params['label_id']??0,
 
             ];
diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php
index 2d91c792b..fb3fe03b7 100644
--- a/app/api/controller/store/StoreController.php
+++ b/app/api/controller/store/StoreController.php
@@ -83,7 +83,6 @@ class StoreController extends BaseApiController
             $find=UserUserLogic::StoreAdd($params);
         }else{
             $find['real_name']=$params['real_name'];
-            $find['user_ship']=$params['user_ship']??0;
             $find['label_id']=$params['label_id']??0;
             $find->save();
         }
diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 144b89d03..4964f4f8a 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -483,9 +483,14 @@ class PayNotifyLogic extends BaseLogic
         bcscale(2);
         //        $user->now_money = bcadd($user->now_money, $price, 2);//v.1
         //更新等级
-        if ($price >= Config::where('name','recharge')->value('value')) {
+        $limit_1=UserShip::where('id',1)->value('limit');
+        $limit_4=UserShip::where('id',4)->value('limit');
+        if ($price >= $limit_1 &&$price<$limit_4) {
             $user->user_ship = 1; //v.1
         }
+        if ($price>$limit_4) {
+            $user->user_ship = 4;
+        }
         $user->purchase_funds = bcadd($user->purchase_funds, $price, 2);
         $user->total_recharge_amount = bcadd($user->total_recharge_amount, $price, 2);
         $user->save();
diff --git a/app/common/logic/StoreFinanceFlowLogic.php b/app/common/logic/StoreFinanceFlowLogic.php
index 01a9e59c5..a65052b9a 100644
--- a/app/common/logic/StoreFinanceFlowLogic.php
+++ b/app/common/logic/StoreFinanceFlowLogic.php
@@ -130,9 +130,12 @@ class StoreFinanceFlowLogic extends BaseLogic
     /**
      * 核销后更新余额
      */
-    public function updateStatusUser($id,$uid,$money){
+    public function updateStatusUser($id,$uid,$money,$order_id){
         StoreFinanceFlow::where('id', $id)->update(['status' => 1]);
-        User::where('id',$uid)->inc('now_money',$money)->update();
+        $find=User::where('id',$uid)->find();
+        $capitalFlowDao = new CapitalFlowLogic($find);
+        $capitalFlowDao->userIncome('system_balance_add', 'order', $order_id, $money);
+        $find->inc('now_money',$money)->update();
     }