Bladeren bron

#6681 【Go查询】/sbyj/GetMyOrders: 结果返回”TradeHolderDetailEx“添加字段”ClosedDays“

deng.yinping 9 maanden geleden
bovenliggende
commit
1ee78d8952
3 gewijzigde bestanden met toevoegingen van 10 en 8 verwijderingen
  1. 2 2
      models/sbyj.go
  2. 7 5
      pb/mtp2.pb.go
  3. 1 1
      pb/mtp2.proto

+ 2 - 2
models/sbyj.go

@@ -130,7 +130,7 @@ type TradeHolderDetailEx struct {
 	CanAutoAddDeposit    uint64  `json:"canautoadddeposit"`    // 是否允许自动追加定金: 0-否 1-是(52)
 	AddDepositRate       float64 `json:"adddepositrate"`       // 自动追加定金率(52) - 允许时显示
 	CanAutoRefundDeposit uint64  `json:"canautorefunddeposit"` // 是否允许自动退还定金: 0-否 1-是(52)
-	ClosedDays           int32   `json:"closeddays"`           // 剩余平仓天数(52) -1为不强平
+	ClosedDays           int64   `json:"closeddays"`           // 剩余平仓天数(52) -1为不强平
 }
 
 // RedisTradeHolderDetailEx redis存储交易持仓扩展表
@@ -559,7 +559,7 @@ type Tradeholderdetailex struct {
 	CANAUTOADDDEPOSIT    uint64  `json:"canautoadddeposit" xorm:"CANAUTOADDDEPOSIT"`                     // 是否允许自动追加定金: 0-否 1-是(52)
 	ADDDEPOSITRATE       float64 `json:"adddepositrate" xorm:"ADDDEPOSITRATE"`                           // 自动追加定金率(52) - 允许时显示
 	CANAUTOREFUNDDEPOSIT uint64  `json:"canautorefunddeposit" xorm:"CANAUTOREFUNDDEPOSIT"`               // 是否允许自动退还定金: 0-否 1-是(52)
-	CLOSEDDAYS           int32   `json:"closeddays" xorm:"CLOSEDDAYS"`                                   // 剩余平仓天数(52) -1为不强平
+	CLOSEDDAYS           int64   `json:"closeddays" xorm:"CLOSEDDAYS"`                                   // 剩余平仓天数(52) -1为不强平
 
 	GOODSCODE    string  `json:"goodscode" xorm:"GOODSCODE"`       // 期货合约代码(内部)
 	GOODSNAME    string  `json:"goodsname" xorm:"GOODSNAME"`       // 期货合约名称

+ 7 - 5
pb/mtp2.pb.go

@@ -2103,7 +2103,7 @@ type TradeHolderDetailEx struct {
 	CanAutoAddDeposit    *uint64  `protobuf:"varint,38,opt,name=CanAutoAddDeposit" json:"CanAutoAddDeposit,omitempty"`       // 是否允许自动追加定金: 0-否 1-是(52)
 	AddDepositRate       *float64 `protobuf:"fixed64,39,opt,name=AddDepositRate" json:"AddDepositRate,omitempty"`            // 自动追加定金率(52) - 允许时显示
 	CanAutoRefundDeposit *uint64  `protobuf:"varint,40,opt,name=CanAutoRefundDeposit" json:"CanAutoRefundDeposit,omitempty"` // 是否允许自动退还定金: 0-否 1-是(52)
-	ClosedDays 			 *int32   `protobuf:"varint,41,opt,name=ClosedDays" json:"ClosedDays,omitempty"` 					 // 剩余平仓天数(52) -1为不强平
+	ClosedDays           *int64   `protobuf:"varint,41,opt,name=ClosedDays" json:"ClosedDays,omitempty"`                     // 剩余平仓天数(52) -1为不强平
 }
 
 func (x *TradeHolderDetailEx) Reset() {
@@ -2418,11 +2418,11 @@ func (x *TradeHolderDetailEx) GetCanAutoRefundDeposit() uint64 {
 	return 0
 }
 
-func (x *TradeHolderDetailEx) GetClosedDays() int32 {
+func (x *TradeHolderDetailEx) GetClosedDays() int64 {
 	if x != nil && x.ClosedDays != nil {
 		return *x.ClosedDays
 	}
-	return -1
+	return 0
 }
 
 // RedisTradeHolderDetailEx redis存储交易持仓扩展表
@@ -3099,7 +3099,7 @@ var file_mtp2_proto_rawDesc = []byte{
 	0x61, 0x6d, 0x65, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x4d, 0x69, 0x64, 0x64, 0x6c,
 	0x65, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x47, 0x6f,
 	0x6f, 0x64, 0x73, 0x55, 0x6e, 0x69, 0x74, 0x49, 0x44, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x0b, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x55, 0x6e, 0x69, 0x74, 0x49, 0x44, 0x22, 0xf9, 0x0a, 0x0a,
+	0x0b, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x55, 0x6e, 0x69, 0x74, 0x49, 0x44, 0x22, 0x99, 0x0b, 0x0a,
 	0x13, 0x54, 0x72, 0x61, 0x64, 0x65, 0x48, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x44, 0x65, 0x74, 0x61,
 	0x69, 0x6c, 0x45, 0x78, 0x12, 0x18, 0x0a, 0x07, 0x54, 0x72, 0x61, 0x64, 0x65, 0x49, 0x44, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x54, 0x72, 0x61, 0x64, 0x65, 0x49, 0x44, 0x12, 0x1c,
@@ -3187,7 +3187,9 @@ var file_mtp2_proto_rawDesc = []byte{
 	0x52, 0x61, 0x74, 0x65, 0x12, 0x32, 0x0a, 0x14, 0x43, 0x61, 0x6e, 0x41, 0x75, 0x74, 0x6f, 0x52,
 	0x65, 0x66, 0x75, 0x6e, 0x64, 0x44, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x18, 0x28, 0x20, 0x01,
 	0x28, 0x04, 0x52, 0x14, 0x43, 0x61, 0x6e, 0x41, 0x75, 0x74, 0x6f, 0x52, 0x65, 0x66, 0x75, 0x6e,
-	0x64, 0x44, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x22, 0x81, 0x03, 0x0a, 0x18, 0x52, 0x65, 0x64,
+	0x64, 0x44, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x43, 0x6c, 0x6f, 0x73,
+	0x65, 0x64, 0x44, 0x61, 0x79, 0x73, 0x18, 0x29, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x43, 0x6c,
+	0x6f, 0x73, 0x65, 0x64, 0x44, 0x61, 0x79, 0x73, 0x22, 0x81, 0x03, 0x0a, 0x18, 0x52, 0x65, 0x64,
 	0x69, 0x73, 0x54, 0x72, 0x61, 0x64, 0x65, 0x48, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x44, 0x65, 0x74,
 	0x61, 0x69, 0x6c, 0x45, 0x78, 0x12, 0x37, 0x0a, 0x0a, 0x54, 0x48, 0x44, 0x65, 0x74, 0x61, 0x69,
 	0x6c, 0x45, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x70, 0x62, 0x2e, 0x54,

+ 1 - 1
pb/mtp2.proto

@@ -303,7 +303,7 @@ message TradeHolderDetailEx
   optional uint64 CanAutoAddDeposit = 38;    // 是否允许自动追加定金: 0-否 1-是(52)
   optional double AddDepositRate = 39;    // 自动追加定金率(52) - 允许时显示
   optional uint64 CanAutoRefundDeposit = 40;    // 是否允许自动退还定金: 0-否 1-是(52)
-  optional int32 ClosedDays = 41;    // 剩余平仓天数(52) -1为不强平
+  optional int64 ClosedDays = 41;    // 剩余平仓天数(52) -1为不强平
   
 }