fiee/micro-bundle
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feat-hjj-MetricsManager#260226' into dev

Browse Source
This commit is contained in:
jiaji.H 2026-03-11 10:04:47 +08:00
commit fa0df21e7d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/dao/bundleExtend.go
View File

@ -96,7 +96,7 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.Bun
if utils.IsPhoneNumber(req.UserName) { if utils.IsPhoneNumber(req.UserName) {
session = session.Where("u.tel_num = ?", req.UserName) session = session.Where("u.tel_num = ?", req.UserName)
} else { } 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 != "" { if req.BundleName != "" {

4
internal/logic/bundleExtendLogic.go
View File

@ -780,6 +780,8 @@ func buildDefaultBalanceLayout() string {
{"增值数据总数", "increaseDataAnalysisNumber", 2}, {"增值数据总数", "increaseDataAnalysisNumber", 2},
{"当前已用套餐数据数", "bundleDataAnalysisConsumptionNumber", 2}, {"当前已用套餐数据数", "bundleDataAnalysisConsumptionNumber", 2},
{"当前已用增值数据数", "increaseDataAnalysisConsumptionNumber", 2}, {"当前已用增值数据数", "increaseDataAnalysisConsumptionNumber", 2},
{"当前可用套餐数据数", "monthlyBundleDataAnalysisNumber", 2},
{"当前可用增值数据数", "monthlyIncreaseDataAnalysisNumber", 2},
{"当前作废套餐数据数", "invalidBundleDataAnalysisNumber", 2}, {"当前作废套餐数据数", "invalidBundleDataAnalysisNumber", 2},
{"当前作废增值数据数", "invalidIncreaseDataAnalysisNumber", 2}, {"当前作废增值数据数", "invalidIncreaseDataAnalysisNumber", 2},
{"当月新增套餐数据数", "monthlyNewBundleDataAnalysisNumber", 2}, {"当月新增套餐数据数", "monthlyNewBundleDataAnalysisNumber", 2},
@ -794,6 +796,8 @@ func buildDefaultBalanceLayout() string {
{"增值竞品总数", "increaseCompetitiveNumber", 2}, {"增值竞品总数", "increaseCompetitiveNumber", 2},
{"当前已用套餐竞品数", "bundleCompetitiveConsumptionNumber", 2}, {"当前已用套餐竞品数", "bundleCompetitiveConsumptionNumber", 2},
{"当前已用增值竞品数", "increaseCompetitiveConsumptionNumber", 2}, {"当前已用增值竞品数", "increaseCompetitiveConsumptionNumber", 2},
{"当前可用套餐竞品数", "monthlyBundleCompetitiveNumber", 2},
{"当前可用增值竞品数", "monthlyIncreaseCompetitiveNumber", 2},
{"当前作废套餐竞品数", "invalidBundleCompetitiveNumber", 2}, {"当前作废套餐竞品数", "invalidBundleCompetitiveNumber", 2},
{"当前作废增值竞品数", "invalidIncreaseCompetitiveNumber", 2}, {"当前作废增值竞品数", "invalidIncreaseCompetitiveNumber", 2},
{"当月新增套餐竞品数", "monthlyNewBundleCompetitiveNumber", 2}, {"当月新增套餐竞品数", "monthlyNewBundleCompetitiveNumber", 2},