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

Merge branch 'dev-lzh' into dev

Browse Source
This commit is contained in:
lzh 2025-06-24 15:14:18 +08:00
commit d6888a4e3c
4 changed files with 561 additions and 545 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/logic/bundleExtendLogic.go
View File

@ -65,6 +65,11 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (*bundle.GetBundl
copier.Copy(result, &m) copier.Copy(result, &m)
loc, _ := time.LoadLocation("Asia/Shanghai") loc, _ := time.LoadLocation("Asia/Shanghai")
t, _ := time.ParseInLocation(time.DateTime, m.ExpirationTime, loc) t, _ := time.ParseInLocation(time.DateTime, m.ExpirationTime, loc)
if m.OrderUUID != "" {
result.Bought = 2
} else {
result.Bought = 1
}
result.ExpiredTime = t.UnixMilli() result.ExpiredTime = t.UnixMilli()
return result return result
}) })

1
pb/bundle.proto
View File

@ -638,6 +638,7 @@ message BundleBalanceItem{
int32 dataAnalysisNumber = 13; int32 dataAnalysisNumber = 13;
int32 dataAnalysisConsumptionNumber = 14; int32 dataAnalysisConsumptionNumber = 14;
int32 expansionPacksNumber = 15; int32 expansionPacksNumber = 15;
int32 bought = 16;
} }
message GetBundleBalanceListResp{ message GetBundleBalanceListResp{

1086
pb/bundle/bundle.pb.go
View File

File diff suppressed because it is too large Load Diff

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

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-triple. DO NOT EDIT. // Code generated by protoc-gen-go-triple. DO NOT EDIT.
// versions: // versions:
// - protoc-gen-go-triple v1.0.8 // - protoc-gen-go-triple v1.0.8
// - protoc v4.24.0--rc1 // - protoc v3.20.3
// source: pb/bundle.proto // source: pb/bundle.proto
package bundle package bundle