From 560e18ac31bf4e9ae432c0c7c0d132c715c1c5cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Thu, 18 Mar 2021 16:53:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/service/UserRebateService.php   | 13 +++++++------
 app/data/service/UserTransferService.php | 17 +++++++++--------
 app/data/service/UserUpgradeService.php  |  2 +-
 app/data/view/user_transfer/index.html   |  2 +-
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/data/service/UserRebateService.php b/app/data/service/UserRebateService.php
index e0d1a17a1..180b727eb 100644
--- a/app/data/service/UserRebateService.php
+++ b/app/data/service/UserRebateService.php
@@ -19,15 +19,16 @@ class UserRebateService extends Service
      */
     public function amount(int $uuid): array
     {
+        $raw = $this->app->db->raw('amount+charge_amount');
         if ($uuid > 0) {
-            $total = abs($this->app->db->name('DataUserRebate')->whereRaw("uid='{$uuid}' and status=1 and deleted=0")->sum('amount'));
-            $locks = abs($this->app->db->name('DataUserRebate')->whereRaw("uid='{$uuid}' and status=0 and deleted=0")->sum('amount'));
-            $count = abs($this->app->db->name('DataUserTransfer')->whereRaw("uid='{$uuid}' and status>0")->sum('amount+charge_amount'));
+            $count = $this->app->db->name('DataUserTransfer')->whereRaw("uid='{$uuid}' and status>0")->sum($raw);
+            $total = $this->app->db->name('DataUserRebate')->whereRaw("uid='{$uuid}' and status=1 and deleted=0")->sum('amount');
+            $locks = $this->app->db->name('DataUserRebate')->whereRaw("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 {
-            $total = abs($this->app->db->name('DataUserRebate')->whereRaw("status=1 and deleted=0")->sum('amount'));
-            $locks = abs($this->app->db->name('DataUserRebate')->whereRaw("status=0 and deleted=0")->sum('amount'));
-            $count = abs($this->app->db->name('DataUserTransfer')->whereRaw("status>0")->sum('amount+charge_amount'));
+            $count = $this->app->db->name('DataUserTransfer')->whereRaw("status>0")->sum($raw);
+            $total = $this->app->db->name('DataUserRebate')->whereRaw("status=1 and deleted=0")->sum('amount');
+            $locks = $this->app->db->name('DataUserRebate')->whereRaw("status=0 and deleted=0")->sum('amount');
         }
         return [$total, $count, $locks];
     }
diff --git a/app/data/service/UserTransferService.php b/app/data/service/UserTransferService.php
index 6683de3ce..bba60f0eb 100644
--- a/app/data/service/UserTransferService.php
+++ b/app/data/service/UserTransferService.php
@@ -31,16 +31,17 @@ class UserTransferService extends Service
      */
     public function amount(int $uuid): array
     {
+        $raw = $this->app->db->raw('amount+charge_amount');
         if ($uuid > 0) {
-            $total = abs($this->app->db->name('DataUserTransfer')->whereRaw("uid='{$uuid}' and status>=1")->sum('amount'));
-            $audit = abs($this->app->db->name('DataUserTransfer')->whereRaw("uid='{$uuid}' and status>=1 and status<3")->sum('amount'));
-            $locks = abs($this->app->db->name('DataUserTransfer')->whereRaw("uid='{$uuid}' and status=3")->sum('amount'));
-            $count = abs($this->app->db->name('DataUserTransfer')->whereRaw("uid='{$uuid}' and status>=4")->sum('amount'));
+            $locks = abs($this->app->db->name('DataUserTransfer')->whereRaw("uid='{$uuid}' and status=3")->sum($raw));
+            $total = abs($this->app->db->name('DataUserTransfer')->whereRaw("uid='{$uuid}' and status>=1")->sum($raw));
+            $count = abs($this->app->db->name('DataUserTransfer')->whereRaw("uid='{$uuid}' and status>=4")->sum($raw));
+            $audit = abs($this->app->db->name('DataUserTransfer')->whereRaw("uid='{$uuid}' and status>=1 and status<3")->sum($raw));
         } else {
-            $total = abs($this->app->db->name('DataUserTransfer')->whereRaw("status>=1")->sum('amount'));
-            $audit = abs($this->app->db->name('DataUserTransfer')->whereRaw("status>=1 and status<3")->sum('amount'));
-            $locks = abs($this->app->db->name('DataUserTransfer')->whereRaw("status=3")->sum('amount'));
-            $count = abs($this->app->db->name('DataUserTransfer')->whereRaw("status>=4")->sum('amount'));
+            $locks = abs($this->app->db->name('DataUserTransfer')->whereRaw("status=3")->sum($raw));
+            $total = abs($this->app->db->name('DataUserTransfer')->whereRaw("status>=1")->sum($raw));
+            $count = abs($this->app->db->name('DataUserTransfer')->whereRaw("status>=4")->sum($raw));
+            $audit = abs($this->app->db->name('DataUserTransfer')->whereRaw("status>=1 and status<3")->sum($raw));
         }
         return [$total, $count, $audit, $locks];
     }
diff --git a/app/data/service/UserUpgradeService.php b/app/data/service/UserUpgradeService.php
index 8bf5385be..12cea7168 100644
--- a/app/data/service/UserUpgradeService.php
+++ b/app/data/service/UserUpgradeService.php
@@ -118,7 +118,7 @@ class UserUpgradeService extends Service
     {
         $user = $this->app->db->name('DataUser')->where(['id' => $uid])->find();
         if (empty($user)) return [0, '用户查询失败'];
-        if (!empty($user['pids'])) return [0, '已绑定推荐人'];
+        if (!empty($user['pids'])) return [1, '已绑定推荐人'];
         // 检查代理用户
         if (empty($pid)) $pid = $user['pid0'];
         if (empty($pid)) return [0, '绑定推荐人不存在'];
diff --git a/app/data/view/user_transfer/index.html b/app/data/view/user_transfer/index.html
index ebf12b22d..7537164b6 100644
--- a/app/data/view/user_transfer/index.html
+++ b/app/data/view/user_transfer/index.html
@@ -70,7 +70,7 @@
                 提现单号：<span class="color-blue">{$vo.code|default='--'}</span><br>
             </td>
             <td class='text-left nowrap'>
-                {eq name='vo.type' value='2'}
+                {eq name='vo.type' value='wechat_banks'}
                 银行卡号：{$vo.bank_code|default='-'}<br>
                 银行信息：{$vo.bank_name|default='-'}（ {$vo.bank_user|default='-'} ）<br>
                 {else}