diff --git a/internal/dao/bundleExtend.go b/internal/dao/bundleExtend.go index 199ef17..6fb2c08 100644 --- a/internal/dao/bundleExtend.go +++ b/internal/dao/bundleExtend.go @@ -92,7 +92,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, @@ -101,7 +101,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+"%") }