From 4a35f6fa9d670f50f3043b6d431f7bdb4fa37902 Mon Sep 17 00:00:00 2001 From: "jiaji.H" Date: Wed, 11 Mar 2026 10:03:29 +0800 Subject: [PATCH] =?UTF-8?q?Updata=EF=BC=9A=E5=A2=9E=E5=8A=A0=E8=89=BA?= =?UTF-8?q?=E4=BA=BA=E7=BC=96=E5=8F=B7=E6=A3=80=E7=B4=A2=E4=B8=8E=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/dao/bundleExtend.go | 2 +- internal/logic/bundleExtendLogic.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/dao/bundleExtend.go b/internal/dao/bundleExtend.go index 8602415..b066316 100644 --- a/internal/dao/bundleExtend.go +++ b/internal/dao/bundleExtend.go @@ -96,7 +96,7 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.Bun if utils.IsPhoneNumber(req.UserName) { session = session.Where("u.tel_num = ?", req.UserName) } else { - session = session.Where("rn.name like ?", "%"+req.UserName+"%") + session = session.Where("rn.name LIKE ? OR bor.customer_num LIKE ?", "%"+req.UserName+"%", "%"+req.UserName+"%") } } if req.BundleName != "" { diff --git a/internal/logic/bundleExtendLogic.go b/internal/logic/bundleExtendLogic.go index d71b2e2..9f03fc6 100644 --- a/internal/logic/bundleExtendLogic.go +++ b/internal/logic/bundleExtendLogic.go @@ -775,6 +775,8 @@ func buildDefaultBalanceLayout() string { {"增值数据总数", "increaseDataAnalysisNumber", 2}, {"当前已用套餐数据数", "bundleDataAnalysisConsumptionNumber", 2}, {"当前已用增值数据数", "increaseDataAnalysisConsumptionNumber", 2}, + {"当前可用套餐数据数", "monthlyBundleDataAnalysisNumber", 2}, + {"当前可用增值数据数", "monthlyIncreaseDataAnalysisNumber", 2}, {"当前作废套餐数据数", "invalidBundleDataAnalysisNumber", 2}, {"当前作废增值数据数", "invalidIncreaseDataAnalysisNumber", 2}, {"当月新增套餐数据数", "monthlyNewBundleDataAnalysisNumber", 2}, @@ -789,6 +791,8 @@ func buildDefaultBalanceLayout() string { {"增值竞品总数", "increaseCompetitiveNumber", 2}, {"当前已用套餐竞品数", "bundleCompetitiveConsumptionNumber", 2}, {"当前已用增值竞品数", "increaseCompetitiveConsumptionNumber", 2}, + {"当前可用套餐竞品数", "monthlyBundleCompetitiveNumber", 2}, + {"当前可用增值竞品数", "monthlyIncreaseCompetitiveNumber", 2}, {"当前作废套餐竞品数", "invalidBundleCompetitiveNumber", 2}, {"当前作废增值竞品数", "invalidIncreaseCompetitiveNumber", 2}, {"当月新增套餐竞品数", "monthlyNewBundleCompetitiveNumber", 2},