user_pay_order 新增字段

pb/gorpc.proto

@@ -307,27 +307,34 @@ message UserPayOrderVo {     //用户支付订单表
   int64 userId = 2;         //用户ID
   string productCode = 3;   //产品Code
   string orderId = 4;       //订单号
-  float amount = 5;         //订单金额(美元)
-  int64 channelPlanId = 6;         //套餐ID
-  float settleAmount = 7;   //结算金额(美元)
-  int64 currency = 8;      //收款货币类型
-  float currencyAmount = 9; //订单货币金额
-  PayOrderType orderType = 10;     //1 官网购买VIP 2 手机应用商店购买 3 pmp 后台 4 tg 购买
-  BoolInt planOrderType = 11;  //订单类型：1非订阅 或者 2 订阅
-  string payType = 12;      //支付方式：visa, wx, alipay, paypal, coinpal, applePay, googlePay
-  string platform = 13;     //支付平台
-  string snNo = 14;         //支付平台流水号
-  string payUrl = 15;       //支付平台生成的付款地址
-  string paidAddress = 16;  //支付地址
-  int64 refundCount = 17;   //退款次数
-  string ip = 18;           //IP地址
-  string remark = 19;       //订单说明，可选
-  string state = 20;        //订单流转状态
-  string stateDesc = 21;    //订单状态说明，每次更新订单状态时更新
-  Status status = 22;        //订单记录状态，1有效 2暂停
-  int64 createTime = 23;     //订单创建时间
-  int64 updateTime = 24;     //订单修改时间
-  BoolInt isCurrentDevice=25;
+  string title = 5; //支付订单标题
+  string country = 6;//用户国家
+  string province = 7;//用户省份
+  string city = 8;//用户城市
+  string pkgName = 9;//包名
+  string purchaseToken = 10 ;//支付token
+  float amount = 11;         //订单金额(美元)
+  int64 channelPlanId = 12;         //套餐ID
+  float settleAmount = 13;   //结算金额(美元)
+  int64 currency = 14;      //收款货币类型
+  float currencyAmount = 15; //订单货币金额
+  PayOrderType orderType = 16;     //1 官网购买VIP 2 手机应用商店购买 3 pmp 后台 4 tg 购买
+  BoolInt planOrderType = 17;  //订单类型：1非订阅 或者 2 订阅
+  string payType = 18;      //支付方式：visa, wx, alipay, paypal, coinpal, applePay, googlePay
+  string platform = 19;     //支付平台
+  string snNo = 20;         //支付平台流水号
+  string payUrl = 21;       //支付平台生成的付款地址
+  string paidAddress = 22;  //支付地址
+  int64 refundCount = 23;   //退款次数
+  float refundFee = 24; //退款金额
+  string ip = 25;           //IP地址
+  string remark = 26;       //订单说明，可选
+  string state = 27;        //订单流转状态
+  string stateDesc = 28;    //订单状态说明，每次更新订单状态时更新
+  Status status = 29;        //订单记录状态，1有效 2暂停
+  int64 createTime = 30;     //订单创建时间
+  int64 updateTime = 31;     //订单修改时间
+  BoolInt isCurrentDevice = 32;
 }
 
 message UserAuthLogVo {     //用户授权日志表

pb/pay.proto

@@ -10,27 +10,34 @@ message UserPayOrderVo {     //用户支付订单表
   int64 userId = 2;         //用户ID
   string productCode = 3;   //产品Code
   string orderId = 4;       //订单号
-  float amount = 5;         //订单金额(美元)
-  int64 channelPlanId = 6;         //套餐ID
-  float settleAmount = 7;   //结算金额(美元)
-  int64 currency = 8;      //收款货币类型
-  float currencyAmount = 9; //订单货币金额
-  PayOrderType orderType = 10;     //1 官网购买VIP 2 手机应用商店购买 3 pmp 后台 4 tg 购买
-  BoolInt planOrderType = 11;  //订单类型：1非订阅 或者 2 订阅
-  string payType = 12;      //支付方式：visa, wx, alipay, paypal, coinpal, applePay, googlePay
-  string platform = 13;     //支付平台
-  string snNo = 14;         //支付平台流水号
-  string payUrl = 15;       //支付平台生成的付款地址
-  string paidAddress = 16;  //支付地址
-  int64 refundCount = 17;   //退款次数
-  string ip = 18;           //IP地址
-  string remark = 19;       //订单说明，可选
-  string state = 20;        //订单流转状态
-  string stateDesc = 21;    //订单状态说明，每次更新订单状态时更新
-  Status status = 22;        //订单记录状态，1有效 2暂停
-  int64 createTime = 23;     //订单创建时间
-  int64 updateTime = 24;     //订单修改时间
-  BoolInt isCurrentDevice=25;
+  string title = 5; //支付订单标题
+  string country = 6;//用户国家
+  string province = 7;//用户省份
+  string city = 8;//用户城市
+  string pkgName = 9;//包名
+  string purchaseToken = 10 ;//支付token
+  float amount = 11;         //订单金额(美元)
+  int64 channelPlanId = 12;         //套餐ID
+  float settleAmount = 13;   //结算金额(美元)
+  int64 currency = 14;      //收款货币类型
+  float currencyAmount = 15; //订单货币金额
+  PayOrderType orderType = 16;     //1 官网购买VIP 2 手机应用商店购买 3 pmp 后台 4 tg 购买
+  BoolInt planOrderType = 17;  //订单类型：1非订阅 或者 2 订阅
+  string payType = 18;      //支付方式：visa, wx, alipay, paypal, coinpal, applePay, googlePay
+  string platform = 19;     //支付平台
+  string snNo = 20;         //支付平台流水号
+  string payUrl = 21;       //支付平台生成的付款地址
+  string paidAddress = 22;  //支付地址
+  int64 refundCount = 23;   //退款次数
+  float refundFee = 24; //退款金额
+  string ip = 25;           //IP地址
+  string remark = 26;       //订单说明，可选
+  string state = 27;        //订单流转状态
+  string stateDesc = 28;    //订单状态说明，每次更新订单状态时更新
+  Status status = 29;        //订单记录状态，1有效 2暂停
+  int64 createTime = 30;     //订单创建时间
+  int64 updateTime = 31;     //订单修改时间
+  BoolInt isCurrentDevice = 32;
 }
 
 message UserAuthLogVo {     //用户授权日志表

pb/pb/gorpc.pb.go

@@ -2600,27 +2600,34 @@ type UserPayOrderVo struct {
 	UserId          int64                  `protobuf:"varint,2,opt,name=userId,proto3" json:"userId,omitempty"`                                   //用户ID
 	ProductCode     string                 `protobuf:"bytes,3,opt,name=productCode,proto3" json:"productCode,omitempty"`                          //产品Code
 	OrderId         string                 `protobuf:"bytes,4,opt,name=orderId,proto3" json:"orderId,omitempty"`                                  //订单号
-	Amount          float32                `protobuf:"fixed32,5,opt,name=amount,proto3" json:"amount,omitempty"`                                  //订单金额(美元)
-	ChannelPlanId   int64                  `protobuf:"varint,6,opt,name=channelPlanId,proto3" json:"channelPlanId,omitempty"`                     //套餐ID
-	SettleAmount    float32                `protobuf:"fixed32,7,opt,name=settleAmount,proto3" json:"settleAmount,omitempty"`                      //结算金额(美元)
-	Currency        int64                  `protobuf:"varint,8,opt,name=currency,proto3" json:"currency,omitempty"`                               //收款货币类型
-	CurrencyAmount  float32                `protobuf:"fixed32,9,opt,name=currencyAmount,proto3" json:"currencyAmount,omitempty"`                  //订单货币金额
-	OrderType       PayOrderType           `protobuf:"varint,10,opt,name=orderType,proto3,enum=gorpc.PayOrderType" json:"orderType,omitempty"`    //1 官网购买VIP 2 手机应用商店购买 3 pmp 后台 4 tg 购买
-	PlanOrderType   BoolInt                `protobuf:"varint,11,opt,name=planOrderType,proto3,enum=gorpc.BoolInt" json:"planOrderType,omitempty"` //订单类型：1非订阅 或者 2 订阅
-	PayType         string                 `protobuf:"bytes,12,opt,name=payType,proto3" json:"payType,omitempty"`                                 //支付方式：visa, wx, alipay, paypal, coinpal, applePay, googlePay
-	Platform        string                 `protobuf:"bytes,13,opt,name=platform,proto3" json:"platform,omitempty"`                               //支付平台
-	SnNo            string                 `protobuf:"bytes,14,opt,name=snNo,proto3" json:"snNo,omitempty"`                                       //支付平台流水号
-	PayUrl          string                 `protobuf:"bytes,15,opt,name=payUrl,proto3" json:"payUrl,omitempty"`                                   //支付平台生成的付款地址
-	PaidAddress     string                 `protobuf:"bytes,16,opt,name=paidAddress,proto3" json:"paidAddress,omitempty"`                         //支付地址
-	RefundCount     int64                  `protobuf:"varint,17,opt,name=refundCount,proto3" json:"refundCount,omitempty"`                        //退款次数
-	Ip              string                 `protobuf:"bytes,18,opt,name=ip,proto3" json:"ip,omitempty"`                                           //IP地址
-	Remark          string                 `protobuf:"bytes,19,opt,name=remark,proto3" json:"remark,omitempty"`                                   //订单说明，可选
-	State           string                 `protobuf:"bytes,20,opt,name=state,proto3" json:"state,omitempty"`                                     //订单流转状态
-	StateDesc       string                 `protobuf:"bytes,21,opt,name=stateDesc,proto3" json:"stateDesc,omitempty"`                             //订单状态说明，每次更新订单状态时更新
-	Status          Status                 `protobuf:"varint,22,opt,name=status,proto3,enum=gorpc.Status" json:"status,omitempty"`                //订单记录状态，1有效 2暂停
-	CreateTime      int64                  `protobuf:"varint,23,opt,name=createTime,proto3" json:"createTime,omitempty"`                          //订单创建时间
-	UpdateTime      int64                  `protobuf:"varint,24,opt,name=updateTime,proto3" json:"updateTime,omitempty"`                          //订单修改时间
-	IsCurrentDevice BoolInt                `protobuf:"varint,25,opt,name=isCurrentDevice,proto3,enum=gorpc.BoolInt" json:"isCurrentDevice,omitempty"`
+	Title           string                 `protobuf:"bytes,5,opt,name=title,proto3" json:"title,omitempty"`                                      //支付订单标题
+	Country         string                 `protobuf:"bytes,6,opt,name=country,proto3" json:"country,omitempty"`                                  //用户国家
+	Province        string                 `protobuf:"bytes,7,opt,name=province,proto3" json:"province,omitempty"`                                //用户省份
+	City            string                 `protobuf:"bytes,8,opt,name=city,proto3" json:"city,omitempty"`                                        //用户城市
+	PkgName         string                 `protobuf:"bytes,9,opt,name=pkgName,proto3" json:"pkgName,omitempty"`                                  //包名
+	PurchaseToken   string                 `protobuf:"bytes,10,opt,name=purchaseToken,proto3" json:"purchaseToken,omitempty"`                     //支付token
+	Amount          float32                `protobuf:"fixed32,11,opt,name=amount,proto3" json:"amount,omitempty"`                                 //订单金额(美元)
+	ChannelPlanId   int64                  `protobuf:"varint,12,opt,name=channelPlanId,proto3" json:"channelPlanId,omitempty"`                    //套餐ID
+	SettleAmount    float32                `protobuf:"fixed32,13,opt,name=settleAmount,proto3" json:"settleAmount,omitempty"`                     //结算金额(美元)
+	Currency        int64                  `protobuf:"varint,14,opt,name=currency,proto3" json:"currency,omitempty"`                              //收款货币类型
+	CurrencyAmount  float32                `protobuf:"fixed32,15,opt,name=currencyAmount,proto3" json:"currencyAmount,omitempty"`                 //订单货币金额
+	OrderType       PayOrderType           `protobuf:"varint,16,opt,name=orderType,proto3,enum=gorpc.PayOrderType" json:"orderType,omitempty"`    //1 官网购买VIP 2 手机应用商店购买 3 pmp 后台 4 tg 购买
+	PlanOrderType   BoolInt                `protobuf:"varint,17,opt,name=planOrderType,proto3,enum=gorpc.BoolInt" json:"planOrderType,omitempty"` //订单类型：1非订阅 或者 2 订阅
+	PayType         string                 `protobuf:"bytes,18,opt,name=payType,proto3" json:"payType,omitempty"`                                 //支付方式：visa, wx, alipay, paypal, coinpal, applePay, googlePay
+	Platform        string                 `protobuf:"bytes,19,opt,name=platform,proto3" json:"platform,omitempty"`                               //支付平台
+	SnNo            string                 `protobuf:"bytes,20,opt,name=snNo,proto3" json:"snNo,omitempty"`                                       //支付平台流水号
+	PayUrl          string                 `protobuf:"bytes,21,opt,name=payUrl,proto3" json:"payUrl,omitempty"`                                   //支付平台生成的付款地址
+	PaidAddress     string                 `protobuf:"bytes,22,opt,name=paidAddress,proto3" json:"paidAddress,omitempty"`                         //支付地址
+	RefundCount     int64                  `protobuf:"varint,23,opt,name=refundCount,proto3" json:"refundCount,omitempty"`                        //退款次数
+	RefundFee       float32                `protobuf:"fixed32,24,opt,name=refundFee,proto3" json:"refundFee,omitempty"`                           //退款金额
+	Ip              string                 `protobuf:"bytes,25,opt,name=ip,proto3" json:"ip,omitempty"`                                           //IP地址
+	Remark          string                 `protobuf:"bytes,26,opt,name=remark,proto3" json:"remark,omitempty"`                                   //订单说明，可选
+	State           string                 `protobuf:"bytes,27,opt,name=state,proto3" json:"state,omitempty"`                                     //订单流转状态
+	StateDesc       string                 `protobuf:"bytes,28,opt,name=stateDesc,proto3" json:"stateDesc,omitempty"`                             //订单状态说明，每次更新订单状态时更新
+	Status          Status                 `protobuf:"varint,29,opt,name=status,proto3,enum=gorpc.Status" json:"status,omitempty"`                //订单记录状态，1有效 2暂停
+	CreateTime      int64                  `protobuf:"varint,30,opt,name=createTime,proto3" json:"createTime,omitempty"`                          //订单创建时间
+	UpdateTime      int64                  `protobuf:"varint,31,opt,name=updateTime,proto3" json:"updateTime,omitempty"`                          //订单修改时间
+	IsCurrentDevice BoolInt                `protobuf:"varint,32,opt,name=isCurrentDevice,proto3,enum=gorpc.BoolInt" json:"isCurrentDevice,omitempty"`
 	unknownFields   protoimpl.UnknownFields
 	sizeCache       protoimpl.SizeCache
 }
@@ -2683,6 +2690,48 @@ func (x *UserPayOrderVo) GetOrderId() string {
 	return ""
 }
 
+func (x *UserPayOrderVo) GetTitle() string {
+	if x != nil {
+		return x.Title
+	}
+	return ""
+}
+
+func (x *UserPayOrderVo) GetCountry() string {
+	if x != nil {
+		return x.Country
+	}
+	return ""
+}
+
+func (x *UserPayOrderVo) GetProvince() string {
+	if x != nil {
+		return x.Province
+	}
+	return ""
+}
+
+func (x *UserPayOrderVo) GetCity() string {
+	if x != nil {
+		return x.City
+	}
+	return ""
+}
+
+func (x *UserPayOrderVo) GetPkgName() string {
+	if x != nil {
+		return x.PkgName
+	}
+	return ""
+}
+
+func (x *UserPayOrderVo) GetPurchaseToken() string {
+	if x != nil {
+		return x.PurchaseToken
+	}
+	return ""
+}
+
 func (x *UserPayOrderVo) GetAmount() float32 {
 	if x != nil {
 		return x.Amount
@@ -2774,6 +2823,13 @@ func (x *UserPayOrderVo) GetRefundCount() int64 {
 	return 0
 }
 
+func (x *UserPayOrderVo) GetRefundFee() float32 {
+	if x != nil {
+		return x.RefundFee
+	}
+	return 0
+}
+
 func (x *UserPayOrderVo) GetIp() string {
 	if x != nil {
 		return x.Ip
@@ -32674,38 +32730,45 @@ const file_gorpc_proto_rawDesc = "" +
 	"\x05total\x18\x01 \x01(\x03R\x05total\x12)\n" +
 	"\x04list\x18\x02 \x03(\v2\x15.gorpc.GameCategoryVoR\x04list\"2\n" +
 	"\x0eGameRankOption\x12 \n" +
-	"\vshowRanking\x18\x01 \x01(\bR\vshowRanking\"\xa6\x06\n" +
+	"\vshowRanking\x18\x01 \x01(\bR\vshowRanking\"\xe4\a\n" +
 	"\x0eUserPayOrderVo\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\x03R\x02id\x12\x16\n" +
 	"\x06userId\x18\x02 \x01(\x03R\x06userId\x12 \n" +
 	"\vproductCode\x18\x03 \x01(\tR\vproductCode\x12\x18\n" +
-	"\aorderId\x18\x04 \x01(\tR\aorderId\x12\x16\n" +
-	"\x06amount\x18\x05 \x01(\x02R\x06amount\x12$\n" +
-	"\rchannelPlanId\x18\x06 \x01(\x03R\rchannelPlanId\x12\"\n" +
-	"\fsettleAmount\x18\a \x01(\x02R\fsettleAmount\x12\x1a\n" +
-	"\bcurrency\x18\b \x01(\x03R\bcurrency\x12&\n" +
-	"\x0ecurrencyAmount\x18\t \x01(\x02R\x0ecurrencyAmount\x121\n" +
-	"\torderType\x18\n" +
-	" \x01(\x0e2\x13.gorpc.PayOrderTypeR\torderType\x124\n" +
-	"\rplanOrderType\x18\v \x01(\x0e2\x0e.gorpc.BoolIntR\rplanOrderType\x12\x18\n" +
-	"\apayType\x18\f \x01(\tR\apayType\x12\x1a\n" +
-	"\bplatform\x18\r \x01(\tR\bplatform\x12\x12\n" +
-	"\x04snNo\x18\x0e \x01(\tR\x04snNo\x12\x16\n" +
-	"\x06payUrl\x18\x0f \x01(\tR\x06payUrl\x12 \n" +
-	"\vpaidAddress\x18\x10 \x01(\tR\vpaidAddress\x12 \n" +
-	"\vrefundCount\x18\x11 \x01(\x03R\vrefundCount\x12\x0e\n" +
-	"\x02ip\x18\x12 \x01(\tR\x02ip\x12\x16\n" +
-	"\x06remark\x18\x13 \x01(\tR\x06remark\x12\x14\n" +
-	"\x05state\x18\x14 \x01(\tR\x05state\x12\x1c\n" +
-	"\tstateDesc\x18\x15 \x01(\tR\tstateDesc\x12%\n" +
-	"\x06status\x18\x16 \x01(\x0e2\r.gorpc.StatusR\x06status\x12\x1e\n" +
-	"\n" +
-	"createTime\x18\x17 \x01(\x03R\n" +
+	"\aorderId\x18\x04 \x01(\tR\aorderId\x12\x14\n" +
+	"\x05title\x18\x05 \x01(\tR\x05title\x12\x18\n" +
+	"\acountry\x18\x06 \x01(\tR\acountry\x12\x1a\n" +
+	"\bprovince\x18\a \x01(\tR\bprovince\x12\x12\n" +
+	"\x04city\x18\b \x01(\tR\x04city\x12\x18\n" +
+	"\apkgName\x18\t \x01(\tR\apkgName\x12$\n" +
+	"\rpurchaseToken\x18\n" +
+	" \x01(\tR\rpurchaseToken\x12\x16\n" +
+	"\x06amount\x18\v \x01(\x02R\x06amount\x12$\n" +
+	"\rchannelPlanId\x18\f \x01(\x03R\rchannelPlanId\x12\"\n" +
+	"\fsettleAmount\x18\r \x01(\x02R\fsettleAmount\x12\x1a\n" +
+	"\bcurrency\x18\x0e \x01(\x03R\bcurrency\x12&\n" +
+	"\x0ecurrencyAmount\x18\x0f \x01(\x02R\x0ecurrencyAmount\x121\n" +
+	"\torderType\x18\x10 \x01(\x0e2\x13.gorpc.PayOrderTypeR\torderType\x124\n" +
+	"\rplanOrderType\x18\x11 \x01(\x0e2\x0e.gorpc.BoolIntR\rplanOrderType\x12\x18\n" +
+	"\apayType\x18\x12 \x01(\tR\apayType\x12\x1a\n" +
+	"\bplatform\x18\x13 \x01(\tR\bplatform\x12\x12\n" +
+	"\x04snNo\x18\x14 \x01(\tR\x04snNo\x12\x16\n" +
+	"\x06payUrl\x18\x15 \x01(\tR\x06payUrl\x12 \n" +
+	"\vpaidAddress\x18\x16 \x01(\tR\vpaidAddress\x12 \n" +
+	"\vrefundCount\x18\x17 \x01(\x03R\vrefundCount\x12\x1c\n" +
+	"\trefundFee\x18\x18 \x01(\x02R\trefundFee\x12\x0e\n" +
+	"\x02ip\x18\x19 \x01(\tR\x02ip\x12\x16\n" +
+	"\x06remark\x18\x1a \x01(\tR\x06remark\x12\x14\n" +
+	"\x05state\x18\x1b \x01(\tR\x05state\x12\x1c\n" +
+	"\tstateDesc\x18\x1c \x01(\tR\tstateDesc\x12%\n" +
+	"\x06status\x18\x1d \x01(\x0e2\r.gorpc.StatusR\x06status\x12\x1e\n" +
+	"\n" +
+	"createTime\x18\x1e \x01(\x03R\n" +
 	"createTime\x12\x1e\n" +
 	"\n" +
-	"updateTime\x18\x18 \x01(\x03R\n" +
+	"updateTime\x18\x1f \x01(\x03R\n" +
 	"updateTime\x128\n" +
-	"\x0fisCurrentDevice\x18\x19 \x01(\x0e2\x0e.gorpc.BoolIntR\x0fisCurrentDevice\"\xe9\b\n" +
+	"\x0fisCurrentDevice\x18  \x01(\x0e2\x0e.gorpc.BoolIntR\x0fisCurrentDevice\"\xe9\b\n" +
 	"\rUserAuthLogVo\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\x03R\x02id\x12 \n" +
 	"\vproductCode\x18\x02 \x01(\tR\vproductCode\x12\x16\n" +