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

Merge branch 'dev-lzh' into dev

Browse Source
This commit is contained in:
lzh 2025-06-18 16:36:04 +08:00
commit e5255d3022
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/dao/bundleExtend.go
View File

@ -92,7 +92,7 @@ func GetBundleExtendRecordList(req *bundle.BundleExtendRecordsListRequest) (data
func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.BundleBalancePo, total int64, err error) { func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.BundleBalancePo, total int64, err error) {
session := app.ModuleClients.BundleDB.Table("fiee_bundle.bundle_balance AS bb"). session := app.ModuleClients.BundleDB.Table("fiee_bundle.bundle_balance AS bb").
Select(` Select(`
bb .*, bb.*,
bor.expiration_time as expired_time, bor.expiration_time as expired_time,
bor.bundle_name, bor.bundle_name,
bor.status, bor.status,
@ -101,7 +101,8 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.Bun
u.tel_num as user_phone_number u.tel_num as user_phone_number
`). `).
Joins("LEFT JOIN bundle_order_records bor on bor.customer_id = bb .user_id"). 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 != "" { if req.UserName != "" {
session = session.Where("u.nickname like ?", "%"+req.UserName+"%") session = session.Where("u.nickname like ?", "%"+req.UserName+"%")
} }