Compare commits
No commits in common. "cbdeedc1c544e4036f875eac1aad48d8f957ea88" and "509ebb61a68e5e4ab2f499f199e99016e1a47419" have entirely different histories.
cbdeedc1c5
...
509ebb61a6
@ -354,6 +354,7 @@ func CreateBundleBalance(req *bundle.CreateBundleBalanceReq) (*bundle.CreateBund
|
|||||||
data.MonthlyLimitImageNumber = cal(data, data.BundleLimitImageNumber, data.MonthlyLimitImageQuotaNumber, now) + cal(data, data.IncreaseLimitImageNumber, data.MonthlyLimitImageQuotaNumber, now)
|
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.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)
|
data.MonthlyLimitDataAnalysisNumber = cal(data, data.BundleLimitDataAnalysisNumber, data.MonthlyLimitDataAnalysisQuotaNumber, now) + cal(data, data.IncreaseLimitDataAnalysisNumber, data.MonthlyLimitDataAnalysisQuotaNumber, now)
|
||||||
|
|
||||||
err = dao.CreateBundleBalance(data)
|
err = dao.CreateBundleBalance(data)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error(err)
|
logger.Error(err)
|
||||||
@ -494,77 +495,74 @@ func SetBundleBalanceLayout(req *bundle.SetBundleBalanceLayoutReq) (*bundle.SetB
|
|||||||
}
|
}
|
||||||
|
|
||||||
func buildDefaultBalanceLayout() string {
|
func buildDefaultBalanceLayout() string {
|
||||||
var data = []struct {
|
m := map[string]string{
|
||||||
Title string
|
"是否激活": "activate",
|
||||||
Column string
|
"艺人": "userName",
|
||||||
}{
|
"艺人手机号": "userPhoneNumber",
|
||||||
{"是否激活", "activate"},
|
"用户编号": "customerNum",
|
||||||
{"艺人", "userName"},
|
"套餐状态": "status",
|
||||||
{"艺人手机号", "userPhoneNumber"},
|
"最后购买的套餐": "bundleName",
|
||||||
{"用户编号", "customerNum"},
|
"下单时间": "payTime",
|
||||||
{"套餐状态", "status"},
|
"开始有效时间": "startTime",
|
||||||
{"最后购买的套餐", "bundleName"},
|
"过期时间": "expiredTime",
|
||||||
{"下单时间", "payTime"},
|
"所属月份": "month",
|
||||||
{"开始有效时间", "startTime"},
|
"购买状态": "bought",
|
||||||
{"过期时间", "expiredTime"},
|
"当前可用套餐账号数": "bundleAccountNumber",
|
||||||
{"所属月份", "month"},
|
"当前可用增值账号数": "increaseAccountNumber",
|
||||||
{"购买状态", "bought"},
|
"当前已用套餐账号数": "bundleAccountConsumptionNumber",
|
||||||
{"当前可用套餐账号数", "bundleAccountNumber"},
|
"当前已用增值账号数": "increaseAccountConsumptionNumber",
|
||||||
{"当前可用增值账号数", "increaseAccountNumber"},
|
"当前可用套餐视频数": "bundleVideoNumber",
|
||||||
{"当前已用套餐账号数", "bundleAccountConsumptionNumber"},
|
"当前可用增值视频数": "increaseVideoNumber",
|
||||||
{"当前已用增值账号数", "increaseAccountConsumptionNumber"},
|
"当前已用套餐视频数": "bundleVideoConsumptionNumber",
|
||||||
{"当前可用套餐视频数", "bundleVideoNumber"},
|
"当前已用增值视频数": "increaseVideoConsumptionNumber",
|
||||||
{"当前可用增值视频数", "increaseVideoNumber"},
|
"当前作废套餐视频数": "invalidBundleVideoNumber",
|
||||||
{"当前已用套餐视频数", "bundleVideoConsumptionNumber"},
|
"当前作废增值视频数": "invalidIncreaseVideoNumber",
|
||||||
{"当前已用增值视频数", "increaseVideoConsumptionNumber"},
|
"当月新增套餐视频数": "monthlyNewBundleVideoNumber",
|
||||||
{"当前作废套餐视频数", "invalidBundleVideoNumber"},
|
"当月新增增值视频数": "monthlyNewIncreaseVideoNumber",
|
||||||
{"当前作废增值视频数", "invalidIncreaseVideoNumber"},
|
"当月使用套餐视频数": "monthBundleVideoConsumptionNumber",
|
||||||
{"当月新增套餐视频数", "monthlyNewBundleVideoNumber"},
|
"当月使用增值视频数": "monthIncreaseVideoConsumptionNumber",
|
||||||
{"当月新增增值视频数", "monthlyNewIncreaseVideoNumber"},
|
"当月作废套餐视频数": "monthlyInvalidBundleVideoNumber",
|
||||||
{"当月使用套餐视频数", "monthBundleVideoConsumptionNumber"},
|
"当月作废增值视频数": "monthlyInvalidIncreaseVideoNumber",
|
||||||
{"当月使用增值视频数", "monthIncreaseVideoConsumptionNumber"},
|
"当前可用套餐图文数": "bundleImageNumber",
|
||||||
{"当月作废套餐视频数", "monthlyInvalidBundleVideoNumber"},
|
"当前可用增值图文数": "increaseImageNumber",
|
||||||
{"当月作废增值视频数", "monthlyInvalidIncreaseVideoNumber"},
|
"当前已用套餐图文数": "bundleImageConsumptionNumber",
|
||||||
{"当前可用套餐图文数", "bundleImageNumber"},
|
"当前已用增值图文数": "increaseImageConsumptionNumber",
|
||||||
{"当前可用增值图文数", "increaseImageNumber"},
|
"当前作废套餐图文数": "invalidBundleImageNumber",
|
||||||
{"当前已用套餐图文数", "bundleImageConsumptionNumber"},
|
"当前作废增值图文数": "invalidIncreaseImageNumber",
|
||||||
{"当前已用增值图文数", "increaseImageConsumptionNumber"},
|
"当月新增套餐图文数": "monthlyNewBundleImageNumber",
|
||||||
{"当前作废套餐图文数", "invalidBundleImageNumber"},
|
"当月新增增值图文数": "monthlyNewIncreaseImageNumber",
|
||||||
{"当前作废增值图文数", "invalidIncreaseImageNumber"},
|
"当月使用套餐图文数": "monthBundleImageConsumptionNumber",
|
||||||
{"当月新增套餐图文数", "monthlyNewBundleImageNumber"},
|
"当月使用增值图文数": "monthIncreaseImageConsumptionNumber",
|
||||||
{"当月新增增值图文数", "monthlyNewIncreaseImageNumber"},
|
"当月作废套餐图文数": "monthlyInvalidBundleImageNumber",
|
||||||
{"当月使用套餐图文数", "monthBundleImageConsumptionNumber"},
|
"当月作废增值图文数": "monthlyInvalidIncreaseImageNumber",
|
||||||
{"当月使用增值图文数", "monthIncreaseImageConsumptionNumber"},
|
"当前可用套餐数据数": "bundleDataAnalysisNumber",
|
||||||
{"当月作废套餐图文数", "monthlyInvalidBundleImageNumber"},
|
"当前可用增值数据数": "increaseDataAnalysisNumber",
|
||||||
{"当月作废增值图文数", "monthlyInvalidIncreaseImageNumber"},
|
"当前已用套餐数据数": "bundleDataAnalysisConsumptionNumber",
|
||||||
{"当前可用套餐数据数", "bundleDataAnalysisNumber"},
|
"当前已用增值数据数": "increaseDataAnalysisConsumptionNumber",
|
||||||
{"当前可用增值数据数", "increaseDataAnalysisNumber"},
|
"当前作废套餐数据数": "invalidBundleDataAnalysisNumber",
|
||||||
{"当前已用套餐数据数", "bundleDataAnalysisConsumptionNumber"},
|
"当前作废增值数据数": "invalidIncreaseDataAnalysisNumber",
|
||||||
{"当前已用增值数据数", "increaseDataAnalysisConsumptionNumber"},
|
"当月新增套餐数据数": "monthlyNewBundleDataAnalysisNumber",
|
||||||
{"当前作废套餐数据数", "invalidBundleDataAnalysisNumber"},
|
"当月新增增值数据数": "monthlyNewIncreaseDataAnalysisNumber",
|
||||||
{"当前作废增值数据数", "invalidIncreaseDataAnalysisNumber"},
|
"当月使用套餐数据数": "monthBundleDataAnalysisConsumptionNumber",
|
||||||
{"当月新增套餐数据数", "monthlyNewBundleDataAnalysisNumber"},
|
"当月使用增值数据数": "monthIncreaseDataAnalysisConsumptionNumber",
|
||||||
{"当月新增增值数据数", "monthlyNewIncreaseDataAnalysisNumber"},
|
"当月作废套餐数据数": "monthlyInvalidBundleDataAnalysisNumber",
|
||||||
{"当月使用套餐数据数", "monthBundleDataAnalysisConsumptionNumber"},
|
"当月作废增值数据数": "monthlyInvalidIncreaseDataAnalysisNumber",
|
||||||
{"当月使用增值数据数", "monthIncreaseDataAnalysisConsumptionNumber"},
|
"当月新增手动扩展账号数": "monthlyNewManualAccountNumber",
|
||||||
{"当月作废套餐数据数", "monthlyInvalidBundleDataAnalysisNumber"},
|
"当月新增手动扩展视频数": "monthlyNewManualVideoNumber",
|
||||||
{"当月作废增值数据数", "monthlyInvalidIncreaseDataAnalysisNumber"},
|
"当月新增手动扩展图文数": "monthlyNewManualImageNumber",
|
||||||
{"当月新增手动扩展账号数", "monthlyNewManualAccountNumber"},
|
"当月新增手动扩展数据数": "monthlyNewManualDataAnalysisNumber",
|
||||||
{"当月新增手动扩展视频数", "monthlyNewManualVideoNumber"},
|
"当月新增手动扩展时长(日)": "monthlyNewDurationNumber",
|
||||||
{"当月新增手动扩展图文数", "monthlyNewManualImageNumber"},
|
"当月已用手动扩展账号数": "monthlyManualAccountConsumptionNumber",
|
||||||
{"当月新增手动扩展数据数", "monthlyNewManualDataAnalysisNumber"},
|
"当月已用手动扩展视频数": "monthlyManualVideoConsumptionNumber",
|
||||||
{"当月新增手动扩展时长(日)", "monthlyNewDurationNumber"},
|
"当月已用手动扩展图文数": "monthlyManualImageConsumptionNumber",
|
||||||
{"当月已用手动扩展账号数", "monthlyManualAccountConsumptionNumber"},
|
"当月已用手动扩展数据数": "monthlyManualDataAnalysisConsumptionNumber",
|
||||||
{"当月已用手动扩展视频数", "monthlyManualVideoConsumptionNumber"},
|
|
||||||
{"当月已用手动扩展图文数", "monthlyManualImageConsumptionNumber"},
|
|
||||||
{"当月已用手动扩展数据数", "monthlyManualDataAnalysisConsumptionNumber"},
|
|
||||||
}
|
}
|
||||||
jsonMap := []map[string]any{}
|
jsonMap := []map[string]any{}
|
||||||
for _, v := range data {
|
for k, v := range m {
|
||||||
jsonMap = append(jsonMap, map[string]any{
|
jsonMap = append(jsonMap, map[string]any{
|
||||||
"sort": 1,
|
"sort": 1,
|
||||||
"fieldKey": v.Title,
|
"fieldKey": v,
|
||||||
"fieldValue": v.Column,
|
"fieldValue": k,
|
||||||
"sortOrNot": true,
|
"sortOrNot": true,
|
||||||
"status": 1,
|
"status": 1,
|
||||||
"width": 160,
|
"width": 160,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user