From f88a41a89087ab71413f143278ba6abfb8bb95dc Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Wed, 7 Aug 2024 16:57:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=BF=94=E8=A1=A5=E5=B7=B2?=
 =?UTF-8?q?=E6=BB=A1=E4=BD=86=E6=98=AF=E6=9C=AA=E8=AF=BB=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/BillionsLogic.php | 7 -------
 app/api/logic/UserLogic.php     | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/api/logic/BillionsLogic.php b/app/api/logic/BillionsLogic.php
index 892d1536..a6f1a7cc 100755
--- a/app/api/logic/BillionsLogic.php
+++ b/app/api/logic/BillionsLogic.php
@@ -2,13 +2,8 @@
 
 namespace app\api\logic;
 
-use app\admin\logic\WechatCorporatePaymentLogic;
-use app\admin\logic\WechatMerchantTransferLogic;
 use app\common\basics\Logic;
-use app\common\enum\WithdrawEnum;
-use app\common\logic\AccountLogLogic;
 use app\common\model\AccountLog;
-use app\common\model\BalanceWithdrawApply;
 use app\common\model\billions\Billions;
 use app\common\model\distribution\Distribution;
 use app\common\model\distribution\DistributionOrderGoods;
@@ -20,8 +15,6 @@ use app\common\model\user\User;
 use app\common\model\order\Order;
 use app\common\model\RechargeOrder;
 use app\common\model\shop\Shop;
-use app\common\model\WithdrawApply;
-use app\common\server\ConfigServer;
 use think\Exception;
 use think\facade\Db;
 use app\common\enum\PayEnum;
diff --git a/app/api/logic/UserLogic.php b/app/api/logic/UserLogic.php
index 65cb41fc..d27b37d2 100755
--- a/app/api/logic/UserLogic.php
+++ b/app/api/logic/UserLogic.php
@@ -22,6 +22,7 @@ use app\common\server\WeChatServer;
 use EasyWeChat\Factory;
 use EasyWeChat\Kernel\Exceptions\Exception;
 use think\facade\Db;
+use app\common\model\billions\Billions;
 
 class UserLogic extends Logic
 {
@@ -99,6 +100,12 @@ class UserLogic extends Logic
         }
         // 获取集采信息
         $procurement = Mprocurement::where(['user_id' => $user_id, 'u_examine_state' => 1, 'u_state' => 1])->find();
+
+        // 获取返补已满但是未读状态的数量
+        $billion_where[] = ['user_id', '=', $user_id];
+        $billion_where[] = ['state', '>', 0];
+        $billion_where[] = ['is_read', '=', 0];
+        $user['unread_billios'] = Billions::where($billion_where)->count();
         if($procurement != null){
             $user['u_id'] = $procurement['u_id'];
             $user['wholesale_state'] = $procurement['wholesale_state'];