From afb48284773ec5e591ea29f24ded8be85c937733 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 16:41:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=99=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/UserBalance.php     | 2 +-
 app/data/service/UserUpgradeService.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/data/controller/UserBalance.php b/app/data/controller/UserBalance.php
index cdff4a258..3f1bb3868 100644
--- a/app/data/controller/UserBalance.php
+++ b/app/data/controller/UserBalance.php
@@ -74,7 +74,7 @@ class UserBalance extends Controller
     protected function _form_filter(array &$data)
     {
         if (empty($data['code'])) {
-            $data['code'] = CodeExtend::uniqidDate('16', 'B');
+            $data['code'] = CodeExtend::uniqidDate('20', 'B');
         }
         if ($this->request->isPost()) {
             $data['create_by'] = AdminService::instance()->getUserId();
diff --git a/app/data/service/UserUpgradeService.php b/app/data/service/UserUpgradeService.php
index 15906e826..70e713bda 100644
--- a/app/data/service/UserUpgradeService.php
+++ b/app/data/service/UserUpgradeService.php
@@ -93,8 +93,8 @@ class UserUpgradeService extends Service
      */
     public function syncBalance(int $uuid, array $nots = []): array
     {
-        $total = abs($this->app->db->name('DataUserBalance')->where("uid='{$uuid}' and status=1 and amount>0 and deleted=0")->sum('amount'));
-        $count = abs($this->app->db->name('DataUserBalance')->where("uid='{$uuid}' and status=1 and amount<0 and deleted=0")->sum('amount'));
+        $total = abs($this->app->db->name('DataUserBalance')->where("uid='{$uuid}' and amount>0 and deleted=0")->sum('amount'));
+        $count = abs($this->app->db->name('DataUserBalance')->where("uid='{$uuid}' and amount<0 and deleted=0")->sum('amount'));
         if (empty($nots)) {
             $this->app->db->name('DataUser')->where(['id' => $uuid])->update(['balance_total' => $total, 'balance_used' => $count]);
         } else {