From bfbd01fcc1adea437f065b5296d6a92ce28ad488 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 15 Jun 2024 16:07:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BD=99=E9=A2=9D=E5=92=8C=E8=B4=AD=E4=B9=B0=E8=B5=84=E9=87=91?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BC=98=E5=8C=96=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E9=80=BB=E8=BE=91=EF=BC=8C=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E4=BC=9A=E5=91=98=E4=B8=8D=E8=83=BD=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/user/UserLogic.php           |  4 +++-
 app/common/logic/PayNotifyLogic.php          |  2 +-
 app/store/controller/user/UserController.php | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php
index 167aa3c9..49ef54b3 100644
--- a/app/admin/logic/user/UserLogic.php
+++ b/app/admin/logic/user/UserLogic.php
@@ -15,6 +15,7 @@ namespace app\admin\logic\user;
 
 use app\common\enum\user\UserTerminalEnum;
 use app\common\logic\BaseLogic;
+use app\common\model\store_finance_flow\StoreFinanceFlow;
 use app\common\model\user\User;
 use app\common\model\user\UserAddress;
 use app\common\model\user\UserRecharge;
@@ -148,7 +149,7 @@ class UserLogic extends BaseLogic
     {
         $field = [
             'id',  'account', 'nickname', 'avatar', 'real_name',
-            'sex', 'mobile', 'create_time', 'login_time', 'channel'
+            'sex', 'mobile', 'create_time', 'login_time', 'channel','now_money','purchase_funds'
         ];
 
         $user = User::where(['id' => $userId])->field($field)
@@ -156,6 +157,7 @@ class UserLogic extends BaseLogic
 
         $user['channel'] = UserTerminalEnum::getTermInalDesc($user['channel']);
         $user->sex = $user->getData('sex');
+        $user['number']=StoreFinanceFlow::where('other_uid',$userId)->where(['status'=>0,'financial_pm'=>1,'type'=>1])->sum('number');
         return $user->toArray();
     }
 
diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 8d595beb..f542f508 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -212,7 +212,7 @@ class PayNotifyLogic extends BaseLogic
         bcscale(2);
         //        $user->now_money = bcadd($user->now_money, $price, 2);//v.1
         //更新等级
-        if ($price >= 1000) {
+        if ($price >= 0.01) {
             $user->user_ship = 1; //v.1
         }
         $user->purchase_funds = bcadd($user->purchase_funds, $price, 2);
diff --git a/app/store/controller/user/UserController.php b/app/store/controller/user/UserController.php
index 35b8737e..3ad48664 100644
--- a/app/store/controller/user/UserController.php
+++ b/app/store/controller/user/UserController.php
@@ -8,7 +8,7 @@ use app\store\controller\BaseAdminController;
 use app\store\lists\user\UserLists;
 use app\admin\logic\user\UserLogic;
 use app\admin\validate\user\UserValidate;
-
+use app\common\model\user\User;
 
 class UserController extends BaseAdminController
 {
@@ -22,7 +22,7 @@ class UserController extends BaseAdminController
     public function add()
     {
         $params = (new UserValidate())->post()->goCheck('storeAdd');
-        $result = UserLogic::StoreAdd($params);
+         UserLogic::StoreAdd($params);
         if (UserLogic::hasError() ) {
             return $this->fail(UserLogic::getError());
         }
@@ -37,4 +37,14 @@ class UserController extends BaseAdminController
         return $this->success('', $detail);
     }
 
+    public function user_ship(){
+        $user_ship=$this->request->post('user_ship',0);
+        $id=$this->request->post('id',0);
+        if($user_ship==1){
+            return $this->fail('充值会员不能前端设置'); 
+        }
+        User::where('id',$id)->update(['user_ship'=>$user_ship]);
+        return $this->success('设置成功');
+    }
+
 }
\ No newline at end of file