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

Merge branch 'dev-lzh-1009' into dev

Browse Source
This commit is contained in:
lzh 2025-10-10 14:15:55 +08:00
commit c9663f2bfe
3 changed files with 812 additions and 799 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/dao/bundleExtend.go
View File

@ -238,6 +238,9 @@ func GetUsedRecord(req *bundle.GetUsedRecordListReq) (data []model.CostLogPo, to
if req.SubmitTimeStart != 0 { if req.SubmitTimeStart != 0 {
session = session.Where("artist_confirmed_time >= ?", req.SubmitTimeStart/1000) session = session.Where("artist_confirmed_time >= ?", req.SubmitTimeStart/1000)
} }
if req.CostType != 0 {
session = session.Where("cwl.cost_type = ?", req.CostType)
}
if req.User != "" { if req.User != "" {
if utils.IsPhoneNumber(req.User) { if utils.IsPhoneNumber(req.User) {
session = session.Where("artist_phone = ?", req.User) session = session.Where("artist_phone = ?", req.User)

1
pb/bundle.proto
View File

@ -762,6 +762,7 @@ message GetUsedRecordListReq{
int64 submitTimeEnd = 8; int64 submitTimeEnd = 8;
int32 page = 9; int32 page = 9;
int32 pageSize = 10; int32 pageSize = 10;
int32 costType = 11;
} }
message GetUsedRecordListResp { message GetUsedRecordListResp {

1607
pb/bundle/bundle.pb.go
View File

File diff suppressed because it is too large Load Diff