From 66ee0493768b472ff4f0de7a4c7ac35ff8a82d42 Mon Sep 17 00:00:00 2001 From: lzh <1625167628@qq.com> Date: Wed, 22 Oct 2025 14:34:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=88=9D=E5=A7=8B=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/logic/bundleExtendLogic.go | 132 ++++++++++++++-------------- 1 file changed, 67 insertions(+), 65 deletions(-) diff --git a/internal/logic/bundleExtendLogic.go b/internal/logic/bundleExtendLogic.go index de0be2b..488e72a 100644 --- a/internal/logic/bundleExtendLogic.go +++ b/internal/logic/bundleExtendLogic.go @@ -354,7 +354,6 @@ func CreateBundleBalance(req *bundle.CreateBundleBalanceReq) (*bundle.CreateBund data.MonthlyLimitImageNumber = cal(data, data.BundleLimitImageNumber, data.MonthlyLimitImageQuotaNumber, now) + cal(data, data.IncreaseLimitImageNumber, data.MonthlyLimitImageQuotaNumber, now) data.MonthlyLimitDataAnalysisExpireNumber = cal(data, data.BundleLimitDataAnalysisExpiredNumber, data.MonthlyLimitDataAnalysisQuotaNumber, now) + cal(data, data.IncreaseLimitDataAnalysisExpiredNumber, data.MonthlyLimitDataAnalysisQuotaNumber, now) data.MonthlyLimitDataAnalysisNumber = cal(data, data.BundleLimitDataAnalysisNumber, data.MonthlyLimitDataAnalysisQuotaNumber, now) + cal(data, data.IncreaseLimitDataAnalysisNumber, data.MonthlyLimitDataAnalysisQuotaNumber, now) - err = dao.CreateBundleBalance(data) if err != nil { logger.Error(err) @@ -495,74 +494,77 @@ func SetBundleBalanceLayout(req *bundle.SetBundleBalanceLayoutReq) (*bundle.SetB } func buildDefaultBalanceLayout() string { - m := map[string]string{ - "是否激活": "activate", - "艺人": "userName", - "艺人手机号": "userPhoneNumber", - "用户编号": "customerNum", - "套餐状态": "status", - "最后购买的套餐": "bundleName", - "下单时间": "payTime", - "开始有效时间": "startTime", - "过期时间": "expiredTime", - "所属月份": "month", - "购买状态": "bought", - "当前可用套餐账号数": "bundleAccountNumber", - "当前可用增值账号数": "increaseAccountNumber", - "当前已用套餐账号数": "bundleAccountConsumptionNumber", - "当前已用增值账号数": "increaseAccountConsumptionNumber", - "当前可用套餐视频数": "bundleVideoNumber", - "当前可用增值视频数": "increaseVideoNumber", - "当前已用套餐视频数": "bundleVideoConsumptionNumber", - "当前已用增值视频数": "increaseVideoConsumptionNumber", - "当前作废套餐视频数": "invalidBundleVideoNumber", - "当前作废增值视频数": "invalidIncreaseVideoNumber", - "当月新增套餐视频数": "monthlyNewBundleVideoNumber", - "当月新增增值视频数": "monthlyNewIncreaseVideoNumber", - "当月使用套餐视频数": "monthBundleVideoConsumptionNumber", - "当月使用增值视频数": "monthIncreaseVideoConsumptionNumber", - "当月作废套餐视频数": "monthlyInvalidBundleVideoNumber", - "当月作废增值视频数": "monthlyInvalidIncreaseVideoNumber", - "当前可用套餐图文数": "bundleImageNumber", - "当前可用增值图文数": "increaseImageNumber", - "当前已用套餐图文数": "bundleImageConsumptionNumber", - "当前已用增值图文数": "increaseImageConsumptionNumber", - "当前作废套餐图文数": "invalidBundleImageNumber", - "当前作废增值图文数": "invalidIncreaseImageNumber", - "当月新增套餐图文数": "monthlyNewBundleImageNumber", - "当月新增增值图文数": "monthlyNewIncreaseImageNumber", - "当月使用套餐图文数": "monthBundleImageConsumptionNumber", - "当月使用增值图文数": "monthIncreaseImageConsumptionNumber", - "当月作废套餐图文数": "monthlyInvalidBundleImageNumber", - "当月作废增值图文数": "monthlyInvalidIncreaseImageNumber", - "当前可用套餐数据数": "bundleDataAnalysisNumber", - "当前可用增值数据数": "increaseDataAnalysisNumber", - "当前已用套餐数据数": "bundleDataAnalysisConsumptionNumber", - "当前已用增值数据数": "increaseDataAnalysisConsumptionNumber", - "当前作废套餐数据数": "invalidBundleDataAnalysisNumber", - "当前作废增值数据数": "invalidIncreaseDataAnalysisNumber", - "当月新增套餐数据数": "monthlyNewBundleDataAnalysisNumber", - "当月新增增值数据数": "monthlyNewIncreaseDataAnalysisNumber", - "当月使用套餐数据数": "monthBundleDataAnalysisConsumptionNumber", - "当月使用增值数据数": "monthIncreaseDataAnalysisConsumptionNumber", - "当月作废套餐数据数": "monthlyInvalidBundleDataAnalysisNumber", - "当月作废增值数据数": "monthlyInvalidIncreaseDataAnalysisNumber", - "当月新增手动扩展账号数": "monthlyNewManualAccountNumber", - "当月新增手动扩展视频数": "monthlyNewManualVideoNumber", - "当月新增手动扩展图文数": "monthlyNewManualImageNumber", - "当月新增手动扩展数据数": "monthlyNewManualDataAnalysisNumber", - "当月新增手动扩展时长(日)": "monthlyNewDurationNumber", - "当月已用手动扩展账号数": "monthlyManualAccountConsumptionNumber", - "当月已用手动扩展视频数": "monthlyManualVideoConsumptionNumber", - "当月已用手动扩展图文数": "monthlyManualImageConsumptionNumber", - "当月已用手动扩展数据数": "monthlyManualDataAnalysisConsumptionNumber", + var data = []struct { + Title string + Column string + }{ + {"是否激活", "activate"}, + {"艺人", "userName"}, + {"艺人手机号", "userPhoneNumber"}, + {"用户编号", "customerNum"}, + {"套餐状态", "status"}, + {"最后购买的套餐", "bundleName"}, + {"下单时间", "payTime"}, + {"开始有效时间", "startTime"}, + {"过期时间", "expiredTime"}, + {"所属月份", "month"}, + {"购买状态", "bought"}, + {"当前可用套餐账号数", "bundleAccountNumber"}, + {"当前可用增值账号数", "increaseAccountNumber"}, + {"当前已用套餐账号数", "bundleAccountConsumptionNumber"}, + {"当前已用增值账号数", "increaseAccountConsumptionNumber"}, + {"当前可用套餐视频数", "bundleVideoNumber"}, + {"当前可用增值视频数", "increaseVideoNumber"}, + {"当前已用套餐视频数", "bundleVideoConsumptionNumber"}, + {"当前已用增值视频数", "increaseVideoConsumptionNumber"}, + {"当前作废套餐视频数", "invalidBundleVideoNumber"}, + {"当前作废增值视频数", "invalidIncreaseVideoNumber"}, + {"当月新增套餐视频数", "monthlyNewBundleVideoNumber"}, + {"当月新增增值视频数", "monthlyNewIncreaseVideoNumber"}, + {"当月使用套餐视频数", "monthBundleVideoConsumptionNumber"}, + {"当月使用增值视频数", "monthIncreaseVideoConsumptionNumber"}, + {"当月作废套餐视频数", "monthlyInvalidBundleVideoNumber"}, + {"当月作废增值视频数", "monthlyInvalidIncreaseVideoNumber"}, + {"当前可用套餐图文数", "bundleImageNumber"}, + {"当前可用增值图文数", "increaseImageNumber"}, + {"当前已用套餐图文数", "bundleImageConsumptionNumber"}, + {"当前已用增值图文数", "increaseImageConsumptionNumber"}, + {"当前作废套餐图文数", "invalidBundleImageNumber"}, + {"当前作废增值图文数", "invalidIncreaseImageNumber"}, + {"当月新增套餐图文数", "monthlyNewBundleImageNumber"}, + {"当月新增增值图文数", "monthlyNewIncreaseImageNumber"}, + {"当月使用套餐图文数", "monthBundleImageConsumptionNumber"}, + {"当月使用增值图文数", "monthIncreaseImageConsumptionNumber"}, + {"当月作废套餐图文数", "monthlyInvalidBundleImageNumber"}, + {"当月作废增值图文数", "monthlyInvalidIncreaseImageNumber"}, + {"当前可用套餐数据数", "bundleDataAnalysisNumber"}, + {"当前可用增值数据数", "increaseDataAnalysisNumber"}, + {"当前已用套餐数据数", "bundleDataAnalysisConsumptionNumber"}, + {"当前已用增值数据数", "increaseDataAnalysisConsumptionNumber"}, + {"当前作废套餐数据数", "invalidBundleDataAnalysisNumber"}, + {"当前作废增值数据数", "invalidIncreaseDataAnalysisNumber"}, + {"当月新增套餐数据数", "monthlyNewBundleDataAnalysisNumber"}, + {"当月新增增值数据数", "monthlyNewIncreaseDataAnalysisNumber"}, + {"当月使用套餐数据数", "monthBundleDataAnalysisConsumptionNumber"}, + {"当月使用增值数据数", "monthIncreaseDataAnalysisConsumptionNumber"}, + {"当月作废套餐数据数", "monthlyInvalidBundleDataAnalysisNumber"}, + {"当月作废增值数据数", "monthlyInvalidIncreaseDataAnalysisNumber"}, + {"当月新增手动扩展账号数", "monthlyNewManualAccountNumber"}, + {"当月新增手动扩展视频数", "monthlyNewManualVideoNumber"}, + {"当月新增手动扩展图文数", "monthlyNewManualImageNumber"}, + {"当月新增手动扩展数据数", "monthlyNewManualDataAnalysisNumber"}, + {"当月新增手动扩展时长(日)", "monthlyNewDurationNumber"}, + {"当月已用手动扩展账号数", "monthlyManualAccountConsumptionNumber"}, + {"当月已用手动扩展视频数", "monthlyManualVideoConsumptionNumber"}, + {"当月已用手动扩展图文数", "monthlyManualImageConsumptionNumber"}, + {"当月已用手动扩展数据数", "monthlyManualDataAnalysisConsumptionNumber"}, } jsonMap := []map[string]any{} - for k, v := range m { + for _, v := range data { jsonMap = append(jsonMap, map[string]any{ "sort": 1, - "fieldKey": v, - "fieldValue": k, + "fieldKey": v.Title, + "fieldValue": v.Column, "sortOrNot": true, "status": 1, "width": 160,