From b20bf24b1bff811dcc16a42272eedd1b3d4751a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Tue, 16 Mar 2021 17:05:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/UserTransfer.php    | 8 ++++++++
 app/data/service/UserUpgradeService.php | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/data/controller/UserTransfer.php b/app/data/controller/UserTransfer.php
index f00a108a7..aec3ad392 100644
--- a/app/data/controller/UserTransfer.php
+++ b/app/data/controller/UserTransfer.php
@@ -21,6 +21,14 @@ class UserTransfer extends Controller
      */
     private $table = 'DataUserTransfer';
 
+    protected $types = [
+        'wechat_user'    => '转账到我的微信零钱',
+        'wechat_qrcode'  => '线下转账微信收款码',
+        'alipay_qrcode'  => '线下转账支付宝收款码',
+        'alipay_account' => '线下到账到支付宝账户',
+        'bank_offline'   => '线下转账到银行卡账户',
+    ];
+
     /**
      * 提现配置配置
      * @throws \think\db\exception\DataNotFoundException
diff --git a/app/data/service/UserUpgradeService.php b/app/data/service/UserUpgradeService.php
index 70e713bda..3e5b0f5be 100644
--- a/app/data/service/UserUpgradeService.php
+++ b/app/data/service/UserUpgradeService.php
@@ -122,10 +122,10 @@ class UserUpgradeService extends Service
         // 开始处理等级
         [$vipName, $vipCode] = ['普通用户', 0];
         // 统计历史数据
-        $teamsDirect = $this->app->db->name('DataUser')->where(['pid1' => $uid])->where('vip_code>0')->count();
-        $teamsIndirect = $this->app->db->name('DataUser')->where(['pid2' => $uid])->where('vip_code>0')->count();
-        $teamsUsers = $this->app->db->name('DataUser')->where(['pid1|pid2' => $uid])->where('vip_code>0')->count();
         $orderAmount = $this->app->db->name('ShopOrder')->where("uid={$uid} and status>=4")->sum('amount_total');
+        $teamsDirect = $this->app->db->name('DataUser')->where(['pid1' => $uid])->whereRaw('vip_code>0')->count();
+        $teamsIndirect = $this->app->db->name('DataUser')->where(['pid2' => $uid])->whereRaw('vip_code>0')->count();
+        $teamsUsers = $this->app->db->name('DataUser')->where(['pid1|pid2' => $uid])->whereRaw('vip_code>0')->count();
         // 计算用户等级
         foreach ($this->app->db->name('DataUserUpgrade')->where(['status' => 1])->order('number desc')->cursor() as $item) {
             $l1 = empty($item['goods_vip_status']) || $user['buy_vip_entry'] > 0;