user_pay_order 修改curreny 字段类型为int

pb/constant/order_constants/pay.go

@@ -1,9 +1,18 @@
 package order_constants
 
 const (
-	PLAYTYPE_COINPAL string = "coinpal" //加密货币平台coinpal
-	PLAYTYPE_ALIPAY  string = "alipay"  //支付宝支付
-	PLAYTYPE_HUPAY   string = "hupay"   //支付宝支付
+	OrderTypeBuyVipByWeb      = 1 //网页购买VIP
+	OrderTypeBuyVipByAppStore = 2 //应用商店
+	OrderTypeBuyVipByPmp      = 3 //pmp 购买
+	OrderTypeBuyVipByTg       = 4 //tg购买
+)
+
+const (
+	PLAYTYPE_COINPAL   string = "coinpal" //加密货币平台coinpal
+	PLAYTYPE_ALIPAY    string = "alipay"  //支付宝支付
+	PLAYTYPE_HUPAY     string = "hupay"   //支付宝支付
+	PLAYTYPE_GOOGLEPAY string = "google"  //支付宝支付
+	PLAYTYPE_APPLEPAY  string = "apple"   //支付宝支付
 )
 
 // 订单状态

pb/gorpc.proto

@@ -310,7 +310,7 @@ message UserPayOrderVo {     //用户支付订单表
   float amount = 5;         //订单金额(美元)
   int64 channelPlanId = 6;         //套餐ID
   float settleAmount = 7;   //结算金额(美元)
-  string currency = 8;      //收款货币类型
+  int64 currency = 8;      //收款货币类型
   float currencyAmount = 9; //订单货币金额
   PayOrderType orderType = 10;     //1 官网购买VIP 2 手机应用商店购买 3 pmp 后台 4 tg 购买
   BoolInt planOrderType = 11;  //订单类型：1非订阅 或者 2 订阅

pb/pay.proto

@@ -13,7 +13,7 @@ message UserPayOrderVo {     //用户支付订单表
   float amount = 5;         //订单金额(美元)
   int64 channelPlanId = 6;         //套餐ID
   float settleAmount = 7;   //结算金额(美元)
-  string currency = 8;      //收款货币类型
+  int64 currency = 8;      //收款货币类型
   float currencyAmount = 9; //订单货币金额
   PayOrderType orderType = 10;     //1 官网购买VIP 2 手机应用商店购买 3 pmp 后台 4 tg 购买
   BoolInt planOrderType = 11;  //订单类型：1非订阅 或者 2 订阅

pb/pb/gorpc.pb.go

@@ -2603,7 +2603,7 @@ type UserPayOrderVo struct {
 	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        string                 `protobuf:"bytes,8,opt,name=currency,proto3" json:"currency,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 订阅
@@ -2704,11 +2704,11 @@ func (x *UserPayOrderVo) GetSettleAmount() float32 {
 	return 0
 }
 
-func (x *UserPayOrderVo) GetCurrency() string {
+func (x *UserPayOrderVo) GetCurrency() int64 {
 	if x != nil {
 		return x.Currency
 	}
-	return ""
+	return 0
 }
 
 func (x *UserPayOrderVo) GetCurrencyAmount() float32 {
@@ -32683,7 +32683,7 @@ const file_gorpc_proto_rawDesc = "" +
 	"\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(\tR\bcurrency\x12&\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" +