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

修改

Browse Source
This commit is contained in:
桀尼龟 2025-06-24 13:41:10 +08:00
parent 5753c952f4
commit f02601e5e8
4 changed files with 1249 additions and 1234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/dao/orderRecordsDao.go
View File

@ -563,8 +563,11 @@ func GetReconciliationList(req *bundle.GetReconciliationListReq) (*bundle.GetRec
if req.PayChannel != 0 { if req.PayChannel != 0 {
modelObj = modelObj.Where("pay_channel = ?", req.PayChannel) modelObj = modelObj.Where("pay_channel = ?", req.PayChannel)
} }
if req.OrderNo != "" { if req.BundleOrderOn != "" {
modelObj = modelObj.Where("order_no like ?", "%"+req.OrderNo+"%") modelObj = modelObj.Where("bundle_order_on like ?", "%"+req.BundleOrderOn+"%")
}
if req.BundleAddOrderOn != "" {
modelObj = modelObj.Where("bundle_add_order_on like ?", "%"+req.BundleAddOrderOn+"%")
} }
if req.CreatedStart != "" && req.CreatedEnd != "" { if req.CreatedStart != "" && req.CreatedEnd != "" {
modelObj = modelObj.Where("created_at between ? and ?", req.CreatedStart, req.CreatedEnd) modelObj = modelObj.Where("created_at between ? and ?", req.CreatedStart, req.CreatedEnd)

3
pb/bundle.proto
View File

@ -75,7 +75,7 @@ message GetReconciliationListReq{
string bundleName = 2; string bundleName = 2;
int32 payStatus = 3; int32 payStatus = 3;
int32 payChannel = 4; int32 payChannel = 4;
string orderNo = 5; string bundleOrderOn = 5;
string createdStart = 6; string createdStart = 6;
string createdEnd = 7; string createdEnd = 7;
string payTimeStart = 8; string payTimeStart = 8;
@ -84,6 +84,7 @@ message GetReconciliationListReq{
int32 page = 11; int32 page = 11;
int32 pageSize = 12; int32 pageSize = 12;
repeated uint64 userIDS = 13; repeated uint64 userIDS = 13;
string bundleAddOrderOn = 14;
} }
message GetReconciliationListResp{ message GetReconciliationListResp{
repeated ReconciliationInfo list = 1; repeated ReconciliationInfo list = 1;

2471
pb/bundle/bundle.pb.go
View File

File diff suppressed because it is too large Load Diff

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

@ -7,8 +7,8 @@ import (
fmt "fmt" fmt "fmt"
math "math" math "math"
proto "github.com/golang/protobuf/proto" proto "github.com/golang/protobuf/proto"
_ "google.golang.org/protobuf/types/descriptorpb"
_ "github.com/mwitkow/go-proto-validators" _ "github.com/mwitkow/go-proto-validators"
_ "google.golang.org/protobuf/types/descriptorpb"
github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators" github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
) )