internal/dao/orderRecordsDao.go

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

pb/bundle.proto

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

pb/bundle/bundle_triple.pb.go

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