fiee/micro-bundle
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-lzh-0905' into dev

Browse Source
This commit is contained in:
lzh 2025-10-20 17:02:08 +08:00
commit 6cfbf9e079
5 changed files with 5803 additions and 2703 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/dao/bundleExtend.go
View File

@ -376,7 +376,7 @@ func ExtendBundleBalanceByUserId(data model.BundleBalanceExtendPo) error {
}
func CreateBundleBalance(data model.BundleBalance) error {
return app.ModuleClients.BundleDB.Create(&data).Error
return app.ModuleClients.BundleDB.Save(&data).Error
}
func GetUsedRecord(req *bundle.GetUsedRecordListReq) (data []model.CostLogPo, total int64, err error) {

9
internal/logic/bundleExtendLogic.go
View File

@ -132,7 +132,14 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (*bundle.GetBundl
MonthlyManualVideoConsumptionNumber: int32(m.MonthlyManualVideoConsumptionNumber),
MonthlyManualImageConsumptionNumber: int32(m.MonthlyManualImageConsumptionNumber),
MonthlyManualDataAnalysisConsumptionNumber: int32(m.MonthlyManualDataAnalysisConsumptionNumber),
ManualAccountConsumptionNumber: int32(m.ManualAccountConsumptionNumber),
ManualVideoConsumptionNumber: int32(m.ManualVideoConsumptionNumber),
ManualImageConsumptionNumber: int32(m.ManualImageConsumptionNumber),
ManualDataAnalysisConsumptionNumber: int32(m.ManualDataAnalysisConsumptionNumber),
ManualAccountNumber: int32(m.ManualAccountNumber),
ManualVideoNumber: int32(m.ManualVideoNumber),
ManualImageNumber: int32(m.ManualImageNumber),
ManualDataAnalysisNumber: int32(m.ManualDataAnalysisNumber),
Activate: int32(m.Activate),
}

8
pb/bundle.proto
View File

@ -768,6 +768,14 @@ message BundleBalanceItem {
int32 monthlyManualVideoConsumptionNumber = 59; // 当月已用手动扩展视频数
int32 monthlyManualImageConsumptionNumber = 60; // 当月已用手动扩展图文数
int32 monthlyManualDataAnalysisConsumptionNumber = 61; // 当月已用手动扩展数据数
int32 ManualAccountConsumptionNumber = 62; // 已用手动扩展账号数
int32 ManualVideoConsumptionNumber = 63; // 已用手动扩展视频数
int32 ManualImageConsumptionNumber = 64; // 已用手动扩展图文数
int32 ManualDataAnalysisConsumptionNumber = 65; // 已用手动扩展数据数
int32 ManualAccountNumber = 66; // 可用手动扩展账号数
int32 ManualVideoNumber = 67; // 可用手动扩展视频数
int32 ManualImageNumber = 68; // 可用手动扩展图文数
int32 ManualDataAnalysisNumber = 69; // 可用手动扩展数据数
}

7741
pb/bundle/bundle.pb.go
View File

File diff suppressed because it is too large Load Diff

4
pb/bundle/bundle_triple.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-triple. DO NOT EDIT.
// versions:
// - protoc-gen-go-triple v1.0.5
// - protoc v6.32.0
// - protoc-gen-go-triple v1.0.8
// - protoc v3.12.4
// source: pb/bundle.proto
package bundle