This commit is contained in:
蒋海成 2025-02-22 19:10:19 +08:00
parent 63e7326cfe
commit c8abfba259
2 changed files with 20 additions and 20 deletions

View File

@ -68,7 +68,7 @@ message OrderRecord {
string customerID = 3 [json_name = "customerID"]; string customerID = 3 [json_name = "customerID"];
string customerNum = 4 [json_name = "customerNum"]; string customerNum = 4 [json_name = "customerNum"];
string customerName = 5 [json_name = "customerName"]; string customerName = 5 [json_name = "customerName"];
int64 amount = 6 [json_name = "amount"]; float amount = 6 [json_name = "amount"];
int64 amountType = 7 [json_name = "amountType"]; int64 amountType = 7 [json_name = "amountType"];
string signContract = 8 [json_name = "signContract"]; string signContract = 8 [json_name = "signContract"];
string signature = 9 [json_name = "signature"]; string signature = 9 [json_name = "signature"];

View File

@ -474,23 +474,23 @@ type OrderRecord struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Uuid string `protobuf:"bytes,1,opt,name=uuid,proto3" json:"uuid,omitempty"` Uuid string `protobuf:"bytes,1,opt,name=uuid,proto3" json:"uuid,omitempty"`
BundleUuid string `protobuf:"bytes,2,opt,name=bundleUuid,proto3" json:"bundleUuid,omitempty"` BundleUuid string `protobuf:"bytes,2,opt,name=bundleUuid,proto3" json:"bundleUuid,omitempty"`
CustomerID string `protobuf:"bytes,3,opt,name=customerID,proto3" json:"customerID,omitempty"` CustomerID string `protobuf:"bytes,3,opt,name=customerID,proto3" json:"customerID,omitempty"`
CustomerNum string `protobuf:"bytes,4,opt,name=customerNum,proto3" json:"customerNum,omitempty"` CustomerNum string `protobuf:"bytes,4,opt,name=customerNum,proto3" json:"customerNum,omitempty"`
CustomerName string `protobuf:"bytes,5,opt,name=customerName,proto3" json:"customerName,omitempty"` CustomerName string `protobuf:"bytes,5,opt,name=customerName,proto3" json:"customerName,omitempty"`
Amount int64 `protobuf:"varint,6,opt,name=amount,proto3" json:"amount,omitempty"` Amount float32 `protobuf:"fixed32,6,opt,name=amount,proto3" json:"amount,omitempty"`
AmountType int64 `protobuf:"varint,7,opt,name=amountType,proto3" json:"amountType,omitempty"` AmountType int64 `protobuf:"varint,7,opt,name=amountType,proto3" json:"amountType,omitempty"`
SignContract string `protobuf:"bytes,8,opt,name=signContract,proto3" json:"signContract,omitempty"` SignContract string `protobuf:"bytes,8,opt,name=signContract,proto3" json:"signContract,omitempty"`
Signature string `protobuf:"bytes,9,opt,name=signature,proto3" json:"signature,omitempty"` Signature string `protobuf:"bytes,9,opt,name=signature,proto3" json:"signature,omitempty"`
SignedTime string `protobuf:"bytes,10,opt,name=signedTime,proto3" json:"signedTime,omitempty"` SignedTime string `protobuf:"bytes,10,opt,name=signedTime,proto3" json:"signedTime,omitempty"`
PayType int64 `protobuf:"varint,11,opt,name=payType,proto3" json:"payType,omitempty"` PayType int64 `protobuf:"varint,11,opt,name=payType,proto3" json:"payType,omitempty"`
PayTime string `protobuf:"bytes,12,opt,name=payTime,proto3" json:"payTime,omitempty"` PayTime string `protobuf:"bytes,12,opt,name=payTime,proto3" json:"payTime,omitempty"`
CheckoutSessionId string `protobuf:"bytes,13,opt,name=checkoutSessionId,proto3" json:"checkoutSessionId,omitempty"` CheckoutSessionId string `protobuf:"bytes,13,opt,name=checkoutSessionId,proto3" json:"checkoutSessionId,omitempty"`
CheckoutSessionUrl string `protobuf:"bytes,14,opt,name=checkoutSessionUrl,proto3" json:"checkoutSessionUrl,omitempty"` CheckoutSessionUrl string `protobuf:"bytes,14,opt,name=checkoutSessionUrl,proto3" json:"checkoutSessionUrl,omitempty"`
Status int64 `protobuf:"varint,15,opt,name=status,proto3" json:"status,omitempty"` Status int64 `protobuf:"varint,15,opt,name=status,proto3" json:"status,omitempty"`
OrderNo string `protobuf:"bytes,16,opt,name=orderNo,proto3" json:"orderNo,omitempty"` OrderNo string `protobuf:"bytes,16,opt,name=orderNo,proto3" json:"orderNo,omitempty"`
BundleName string `protobuf:"bytes,17,opt,name=bundleName,proto3" json:"bundleName,omitempty"` BundleName string `protobuf:"bytes,17,opt,name=bundleName,proto3" json:"bundleName,omitempty"`
} }
func (x *OrderRecord) Reset() { func (x *OrderRecord) Reset() {
@ -560,7 +560,7 @@ func (x *OrderRecord) GetCustomerName() string {
return "" return ""
} }
func (x *OrderRecord) GetAmount() int64 { func (x *OrderRecord) GetAmount() float32 {
if x != nil { if x != nil {
return x.Amount return x.Amount
} }
@ -1012,7 +1012,7 @@ var file_pb_bundle_proto_rawDesc = []byte{
0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x12, 0x22, 0x0a, 0x0c, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x12, 0x22, 0x0a, 0x0c,
0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01,
0x28, 0x09, 0x52, 0x0c, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65,
0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x02,
0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6d, 0x6f, 0x75, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x6d, 0x6f, 0x75,
0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x61, 0x6d, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x61, 0x6d,
0x6f, 0x75, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x67, 0x6e, 0x6f, 0x75, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x67, 0x6e,