From 335a61d6e71b0fd703def001b191385d80a9fff0 Mon Sep 17 00:00:00 2001 From: lzh <1625167628@qq.com> Date: Fri, 27 Jun 2025 14:44:42 +0800 Subject: [PATCH] =?UTF-8?q?"=E6=B7=BB=E5=8A=A0=E8=BF=87=E6=9C=9F=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E9=99=8D=E5=BA=8F=E6=8E=92=E5=BA=8F=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=9F=A5=E8=AF=A2=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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/dao/bundleExtend.go b/internal/dao/bundleExtend.go index 0f2ef57..eb6d239 100644 --- a/internal/dao/bundleExtend.go +++ b/internal/dao/bundleExtend.go @@ -114,7 +114,8 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.Bun Joins("LEFT JOIN (?) as bor ON bor.customer_id = u.id", subQuery). Joins("LEFT JOIN micro_bundle.bundle_balance bb ON u.id = bb.user_id AND bb.order_uuid = bor.uuid"). Where("rn.name IS NOT NULL"). - Where("u.deleted_at = 0") + Where("u.deleted_at = 0"). + Order("bor.expiration_time desc") if req.UserName != "" { if utils.IsPhoneNumber(req.UserName) { session = session.Where("u.tel_num = ?", req.UserName) @@ -166,11 +167,10 @@ func GetBundleBalanceByUserId(req *bundle.GetBundleBalanceByUserIdReq) (data mod } var additionalInfo model.UserBundleBalancePo err = app.ModuleClients.BundleDB.Model(&model.BundleExtensionRecords{}). - Select("user_id, SUM(account_additional) as account_additional, SUM(images_additional) as image_additional, SUM(video_additional) as video_additional, SUM(data_additional) as data_additional"). + Select("SUM(account_additional) as account_additional, SUM(images_additional) as image_additional, SUM(video_additional) as video_additional, SUM(data_additional) as data_additional"). Where("type = 1"). // 手动扩展 Where("user_id = ?", req.UserId). Where("created_at > ?", data.PayTime). // 判断扩展是否生效 - Group("user_id"). First(&additionalInfo).Error if err != nil { return