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:42:22 +08:00
commit 58a066315b
4 changed files with 1925 additions and 1909 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/dao/orderRecordsDao.go
View File

@ -583,8 +583,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

@ -82,7 +82,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;
@ -91,6 +91,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;

3800
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 v3.20.3 // - protoc v4.24.0--rc1
// source: pb/bundle.proto // source: pb/bundle.proto
package bundle package bundle