From 37c525d5c247482b0937397c9f6a6d18e1e85d34 Mon Sep 17 00:00:00 2001 From: lzh <1625167628@qq.com> Date: Fri, 27 Jun 2025 16:10:39 +0800 Subject: [PATCH] =?UTF-8?q?"=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E6=9F=A5=E8=AF=A2SQL=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=EF=BC=9B=E4=BF=AE=E6=AD=A3=E5=8F=91=E5=B8=83=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0ID=E5=AD=97=E6=AE=B5=E5=91=BD=E5=90=8D=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E5=86=99=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/dao/bundleExtend.go | 5 +++-- internal/model/cast.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/dao/bundleExtend.go b/internal/dao/bundleExtend.go index c654789..d3be71c 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 fiee_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,7 +167,7 @@ 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). // 判断扩展是否生效 diff --git a/internal/model/cast.go b/internal/model/cast.go index e5db65d..ec44616 100644 --- a/internal/model/cast.go +++ b/internal/model/cast.go @@ -13,7 +13,7 @@ type CostLog struct { WorkCategory uint8 `gorm:"column:work_category;type:tinyint(1);NOT NULL;default:1;comment: 1 图文 2 视频" json:"workCategory"` BundleUuid string `gorm:"column:bundle_uuid;type:varchar(50);NOT NULL;index:idx_bundle_uuid;default:'';comment:套餐ID uuid" json:"bundleUuid"` BundleName string `gorm:"column:bundle_name;type:varchar(50);NOT NULL;default:'';comment:套餐名称" json:"bundleName"` - PlatformIDs string `gorm:"column:platform_ids;type:json;NOT NULL;comment:发布平台ID集合" json:"platformIDs"` + PlatformIds string `gorm:"column:platform_ids;type:json;NOT NULL;comment:发布平台ID集合" json:"platformIDs"` MediaNames string `gorm:"column:media_names;type:varchar(600);NOT NULL;default:'';comment:自媒体账号名称集合" json:"mediaNames"` MediaAccIDs string `gorm:"column:media_acc_ids;type:varchar(600);NOT NULL;default:'';comment:自媒体账号ID集合" json:"mediaAccIDs"` WorkTitle string `gorm:"column:work_title;type:varchar(50);NOT NULL;" json:"workTitle"`