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

Update：使用记录增加套餐类型过滤

Browse Source
This commit is contained in:
jiaji.H 2026-06-10 17:46:45 +08:00
parent bb30a04163
commit ae3d62ff24
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/dao/bundleExtend.go
View File

@ -580,7 +580,9 @@ func GetUsedRecord(req *bundle.GetUsedRecordListReq) (data []model.CostLogPo, to
Table("cast_cost_log ccl").
Select("ccl.*,cwe.cost_type").
Joins("left join cast_work_extra cwe on cwe.work_uuid = ccl.work_uuid").
Where("cwe.deleted_at = 0 and ccl.deleted_at = 0")
Joins("left join bundle_order_record bor on bor.uuid = ccl.order_uuid").
Where("bor.order_type = ?", req.BundleType).
Where("cwe.deleted_at = 0 and ccl.deleted_at = 0 and bor.deleted_at is null")
if req.WorkTitle != "" {
session = session.Where("ccl.work_title like ?", "%"+req.WorkTitle+"%")
}

1
pb/bundle.proto
View File

@ -1143,6 +1143,7 @@ message GetUsedRecordListReq{
int32 page = 9;
int32 pageSize = 10;
int32 costType = 11;
int32 bundleType = 12;
}
message GetUsedRecordListResp {

12
pb/bundle/bundle.pb.go
View File

@ -8971,6 +8971,7 @@ type GetUsedRecordListReq struct {
Page int32 `protobuf:"varint,9,opt,name=page,proto3" json:"page"`
PageSize int32 `protobuf:"varint,10,opt,name=pageSize,proto3" json:"pageSize"`
CostType int32 `protobuf:"varint,11,opt,name=costType,proto3" json:"costType"`
BundleType int32 `protobuf:"varint,12,opt,name=bundleType,proto3" json:"bundleType"`
}
func (x *GetUsedRecordListReq) Reset() {
@ -9082,6 +9083,13 @@ func (x *GetUsedRecordListReq) GetCostType() int32 {
return 0
}
func (x *GetUsedRecordListReq) GetBundleType() int32 {
if x != nil {
return x.BundleType
}
return 0
}
type GetUsedRecordListResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -23807,7 +23815,7 @@ var file_pb_bundle_proto_rawDesc = []byte{
0x22, 0x32, 0x0a, 0x14, 0x41, 0x64, 0x64, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x42, 0x61, 0x6c,
0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x64,
0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x75, 0x73, 0x65, 0x64,
0x54, 0x79, 0x70, 0x65, 0x22, 0xca, 0x02, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x64,
0x54, 0x79, 0x70, 0x65, 0x22, 0xea, 0x02, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x64,
0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a,
0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x73, 0x65,
0x72, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x02, 0x20,
@ -23828,6 +23836,8 @@ var file_pb_bundle_proto_rawDesc = []byte{
0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, 0x67,
0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70,
0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70,
0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18,
0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x54, 0x79, 0x70,
0x65, 0x22, 0x57, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x64, 0x52, 0x65, 0x63, 0x6f,
0x72, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f,
0x74, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c,