From b7609f2651d5d28940b0246271b849c44ea3f046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Mon, 15 Mar 2021 18:07:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=88=A9=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/UserRebate.php      |  8 ++++++--
 app/data/service/UserUpgradeService.php | 18 ++++++++++++------
 app/data/view/user_rebate/index.html    |  5 +++--
 app/data/view/user_upgrade/index.html   |  2 +-
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/app/data/controller/UserRebate.php b/app/data/controller/UserRebate.php
index 785d9b0a9..99edfc341 100644
--- a/app/data/controller/UserRebate.php
+++ b/app/data/controller/UserRebate.php
@@ -29,12 +29,16 @@ class UserRebate extends Controller
      */
     public function index()
     {
+
         $this->title = '用户返利记录';
+        // 统计所有返利
+        $this->rebate = UserUpgradeService::instance()->syncRebate(0);
+        // 创建查询对象
         $query = $this->_query($this->table)->equal('type')->like('name,order_no');
-        // 会员查询
+        // 会员条件查询
         $db = $this->_query('DataUser')->like('nickname#order_nickname,phone#order_phone')->db();
         if ($db->getOptions('where')) $query->whereRaw("order_uid in {$db->field('id')->buildSql()}");
-        // 代理查询
+        // 代理条件查询
         $db = $this->_query('DataUser')->like('nickname#agent_nickname,phone#agent_phone')->db();
         if ($db->getOptions('where')) $query->whereRaw("uid in {$db->field('id')->buildSql()}");
         // 查询分页
diff --git a/app/data/service/UserUpgradeService.php b/app/data/service/UserUpgradeService.php
index b5ffe7d35..15906e826 100644
--- a/app/data/service/UserUpgradeService.php
+++ b/app/data/service/UserUpgradeService.php
@@ -69,12 +69,18 @@ class UserUpgradeService extends Service
      */
     public function syncRebate(int $uuid): array
     {
-        $count = abs($this->app->db->name('DataUserTransfer')->where("uid='{$uuid}' and status>0")->sum('amount'));
-        $total = abs($this->app->db->name('DataUserRebate')->where("uid='{$uuid}' and status=1 and deleted=0")->sum('amount'));
-        $locks = abs($this->app->db->name('DataUserRebate')->where("uid='{$uuid}' and status=0 and deleted=0")->sum('amount'));
-        $this->app->db->name('DataUser')->where(['id' => $uuid])->update([
-            'rebate_total' => $total, 'rebate_used' => $count, 'rebate_lock' => $locks,
-        ]);
+        if ($uuid > 0) {
+            $count = abs($this->app->db->name('DataUserTransfer')->where("uid='{$uuid}' and status>0")->sum('amount'));
+            $total = abs($this->app->db->name('DataUserRebate')->where("uid='{$uuid}' and status=1 and deleted=0")->sum('amount'));
+            $locks = abs($this->app->db->name('DataUserRebate')->where("uid='{$uuid}' and status=0 and deleted=0")->sum('amount'));
+            $this->app->db->name('DataUser')->where(['id' => $uuid])->update([
+                'rebate_total' => $total, 'rebate_used' => $count, 'rebate_lock' => $locks,
+            ]);
+        } else {
+            $count = abs($this->app->db->name('DataUserTransfer')->whereRaw("status>0")->sum('amount'));
+            $total = abs($this->app->db->name('DataUserRebate')->where("status=1 and deleted=0")->sum('amount'));
+            $locks = abs($this->app->db->name('DataUserRebate')->where("status=0 and deleted=0")->sum('amount'));
+        }
         return [$total, $count, $locks];
     }
 
diff --git a/app/data/view/user_rebate/index.html b/app/data/view/user_rebate/index.html
index ef15aa440..24111be67 100644
--- a/app/data/view/user_rebate/index.html
+++ b/app/data/view/user_rebate/index.html
@@ -1,9 +1,10 @@
 {extend name="../../admin/view/main"}
 
 {block name="content"}
-<div class="layui-badge think-bg-blue text-left notselect block shadow padding-10 padding-left-20 border-radius-5 font-s15 ">
-    统计：已产生返利累计 {$total.total|default=0.00} 元，已提现 {$total.used|default=0.00} 元，未提现 0 元
+<div class="layui-badge think-bg-violet text-left notselect block shadow margin-0 padding-10 padding-left-20 border-radius-5 font-s15">
+    统计，已产生返利累计 {$rebate.0|default=0.00} 元（ 不含锁定 {$rebate.2|default='0.00'} 元 ），累计已提现 {$total.1|default=0.00} 元。
 </div>
+
 <div class="think-box-shadow margin-top-10">
     {include file='user_rebate/index_search'}
     <table class="layui-table" lay-skin="line">
diff --git a/app/data/view/user_upgrade/index.html b/app/data/view/user_upgrade/index.html
index 54b469307..39a16e4fd 100644
--- a/app/data/view/user_upgrade/index.html
+++ b/app/data/view/user_upgrade/index.html
@@ -11,7 +11,7 @@
 {/block}
 
 {block name='content'}
-<div class="layui-badge think-bg-red text-left notselect block shadow padding-10 padding-left-20 border-radius-5 font-s15 ">
+<div class="layui-badge think-bg-violet text-left notselect block shadow margin-0 padding-10 padding-left-20 border-radius-5 font-s15">
     注意，用户等级配置不能随意修改或删除，会影响系统结算与用户升级！
 </div>