Compare commits
	
		
			2 Commits
		
	
	
		
			f2785fd407
			...
			66f70eb643
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 66f70eb643 | |||
| b9313b9ba2 | 
| @ -273,6 +273,9 @@ func OrderRecordDetail(req *bundle.OrderRecordsDetailRequest) (res *bundle.Order | |||||||
| 	if req.BundleUUID != "" { | 	if req.BundleUUID != "" { | ||||||
| 		query = query.Where("bundle_uuid = ?", req.BundleUUID) | 		query = query.Where("bundle_uuid = ?", req.BundleUUID) | ||||||
| 	} | 	} | ||||||
|  | 	if req.Status != 0 { | ||||||
|  | 		query = query.Where("status = ?", req.Status) | ||||||
|  | 	} | ||||||
| 	err = query.Order("expiration_time desc").First(&orderRecord).Error | 	err = query.Order("expiration_time desc").First(&orderRecord).Error | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return res, commonErr.ReturnError(err, msg.ErrorGetOrderInfo, "获取订单信息失败: ") | 		return res, commonErr.ReturnError(err, msg.ErrorGetOrderInfo, "获取订单信息失败: ") | ||||||
|  | |||||||
| @ -416,6 +416,7 @@ message OrderRecordsDetailRequest { | |||||||
|   string orderNo = 2 [json_name = "orderNo"]; |   string orderNo = 2 [json_name = "orderNo"]; | ||||||
|   string customerID = 3 [json_name = "customerID"]; |   string customerID = 3 [json_name = "customerID"]; | ||||||
|   string bundleUUID = 4 [json_name = "bundleUUID"]; |   string bundleUUID = 4 [json_name = "bundleUUID"]; | ||||||
|  |   uint64 status = 5 [json_name = "status"]; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| message OrderRecordsDetailResponse { | message OrderRecordsDetailResponse { | ||||||
|  | |||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -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" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -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 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user