From 370f0a08c101bee255c665477e2ccf0b4a404d28 Mon Sep 17 00:00:00 2001 From: lzh <1625167628@qq.com> Date: Wed, 18 Jun 2025 16:35:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E8=BD=AF=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=9A=84=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/dao/bundleExtend.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/dao/bundleExtend.go b/internal/dao/bundleExtend.go index 781b7a3..4b1473c 100644 --- a/internal/dao/bundleExtend.go +++ b/internal/dao/bundleExtend.go @@ -90,7 +90,7 @@ func GetBundleExtendRecordList(req *bundle.BundleExtendRecordsListRequest) (data func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.BundleBalancePo, total int64, err error) { session := app.ModuleClients.BundleDB.Table("fiee_bundle.bundle_balance AS bb"). Select(` - bb .*, + bb.*, bor.expiration_time as expired_time, bor.bundle_name, bor.status, @@ -99,7 +99,8 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.Bun u.tel_num as user_phone_number `). Joins("LEFT JOIN bundle_order_records bor on bor.customer_id = bb .user_id"). - Joins("LEFT JOIN `micro-account`.`user` u on u.id = bb.user_id") + Joins("LEFT JOIN `micro-account`.`user` u on u.id = bb.user_id"). + Where("bor.deleted_at IS NOT NULL") if req.UserName != "" { session = session.Where("u.nickname like ?", "%"+req.UserName+"%") }