payOrder start

pb/common.proto

@@ -43,6 +43,15 @@ enum UserLevel {
     UserLevelInternal = 9999; // 内部 9999
 }
 
+// 1 官网购买VIP 2 应用商店购买 3 pmp 后台 4 tg 购买
+enum PayOrderType {
+  PayOrderTypeUnknown = 0;
+  PayOrderTypeOw = 1; // 官网购买VIP
+  PayOrderTypeAppStore = 2; // 手机应用商店购买
+  PayOrderTypePmp = 3; // pmp 后台购买
+  PayOrderTypeTg = 4; // tg 购买
+}
+
 message Empty {}
 
 message Int64SelectController {

pb/constant/order_constants/pay.go

@@ -0,0 +1,65 @@
+package order_constants
+
+const (
+	PLATFORM_GLOCASH int64 = 1 //信用卡（目前只有它）
+	PLATFORM_COINPAL int64 = 2 //加密货币平台coinpal
+	PLATFORM_BINANCE int64 = 3 //binance 平台，币安
+	PLATFORM_SAFEPAY int64 = 4 //safepay
+	PLATFORM_FASTPAY int64 = 5 //fastpay
+	PLATFORM_LIVPAY  int64 = 6 //livpay
+	PLATFORM_ZARIN   int64 = 7 //zarin
+	PLATFORM_GOPAY   int64 = 8 //gopay
+)
+
+// 订单状态
+const (
+	ORDER_STATE_UNPAID              = "unpaid"              //交易未付款
+	ORDER_STATE_PARTIAL_PAID        = "partial_paid"        //部分已支付
+	ORDER_STATE_PAID                = "paid"                //交易已付款
+	ORDER_STATE_PENDING             = "pending"             //付款处理中（非实时到帐或处理延迟）
+	ORDER_STATE_CANCELED            = "cancelled"           //付款已取消（由付款人操作）
+	ORDER_STATE_FAILED              = "failed"              //付款已失败
+	ORDER_STATE_REFUNDING           = "refunding"           //退款处理中
+	ORDER_STATE_REFUNDED            = "refunded"            //已全额退款
+	ORDER_STATE_COMPLAINT           = "complaint"           //付款存在争议（由付款人发起）
+	ORDER_STATE_CHARGEBACK          = "chargeback"          //交易已拒付/撤单
+	ORDER_STATE_EXPIRED             = "expired"             //订单超时
+	ORDER_STATE_CREATE_FAILED       = "create_failed"       //订单创建失败,	调用第三方创建接口失败
+	ORDER_STATE_PAID_FOR_PMP        = "paid_pmp"            //人工处理成功
+	ORDER_STATE_APPSERVER_FORBIDDEN = "appserver_forbidden" //appserver 那边认为非法订单(如套餐不能续费)，这种状态不需要重试，代理退款时可以退款
+)
+
+func IsFixState(state string) bool {
+	if state == ORDER_STATE_PAID ||
+		state == ORDER_STATE_CANCELED ||
+		//state == ORDER_STATE_FAILED ||
+		//state == ORDER_STATE_EXPIRED ||
+		// state == ORDER_STATE_REFUNDING ||
+		// state == ORDER_STATE_REFUNDED ||
+		state == ORDER_STATE_COMPLAINT ||
+		state == ORDER_STATE_CHARGEBACK ||
+		state == ORDER_STATE_APPSERVER_FORBIDDEN {
+		return true
+	}
+
+	return false
+}
+
+func IsPaid(state string) bool {
+	return state == ORDER_STATE_PAID
+}
+
+func IsFailed(state string) bool {
+	if state == ORDER_STATE_CANCELED ||
+		state == ORDER_STATE_FAILED ||
+		state == ORDER_STATE_REFUNDING ||
+		state == ORDER_STATE_REFUNDED ||
+		state == ORDER_STATE_COMPLAINT ||
+		state == ORDER_STATE_CHARGEBACK ||
+		state == ORDER_STATE_EXPIRED {
+		return true
+	}
+
+	return false
+
+}

pb/gorpc.proto

@@ -62,6 +62,15 @@ enum UserLevel {
     UserLevelInternal = 9999; // 内部 9999
 }
 
+// 1 官网购买VIP 2 应用商店购买 3 pmp 后台 4 tg 购买
+enum PayOrderType {
+  PayOrderTypeUnknown = 0;
+  PayOrderTypeOw = 1; // 官网购买VIP
+  PayOrderTypeAppStore = 2; // 手机应用商店购买
+  PayOrderTypePmp = 3; // pmp 后台购买
+  PayOrderTypeTg = 4; // tg 购买
+}
+
 message Empty {}
 
 message Int64SelectController {
@@ -302,19 +311,20 @@ message UserPayOrderVo {     //用户支付订单表
   float settleAmount = 6;   //结算金额(美元)
   string currency = 7;      //收款货币类型
   float currencyAmount = 8; //订单货币金额
-  BoolInt orderType = 9;     //订单类型：1非订阅 或者 2 订阅
-  string payType = 10;      //支付方式：visa, wx, alipay, paypal, coinpal, applePay, googlePay
-  string platform = 11;     //支付平台
-  string snNo = 12;         //支付平台流水号
-  string payUrl = 13;       //支付平台生成的付款地址
-  string paidAddress = 14;  //支付地址
-  string ip = 15;           //IP地址
-  string remark = 16;       //订单说明，可选
-  string state = 17;        //订单流转状态
-  string stateDesc = 18;    //订单状态说明，每次更新订单状态时更新
-  int32 status = 19;        //订单记录状态，1有效 2暂停
-  int64 createTime = 20;     //订单创建时间
-  int64 updateTime = 21;     //订单修改时间
+  PayOrderType orderType = 9;     //订单类型：1非订阅 或者 2 订阅
+  BoolInt planOrderType = 10;  //订单类型：1非订阅 或者 2 订阅
+  string payType = 11;      //支付方式：visa, wx, alipay, paypal, coinpal, applePay, googlePay
+  string platform = 12;     //支付平台
+  string snNo = 13;         //支付平台流水号
+  string payUrl = 14;       //支付平台生成的付款地址
+  string paidAddress = 15;  //支付地址
+  string ip = 16;           //IP地址
+  string remark = 17;       //订单说明，可选
+  string state = 18;        //订单流转状态
+  string stateDesc = 19;    //订单状态说明，每次更新订单状态时更新
+  Status status = 20;        //订单记录状态，1有效 2暂停
+  int64 createTime = 21;     //订单创建时间
+  int64 updateTime = 22;     //订单修改时间
 }
 
 message UserAuthLogVo {     //用户授权日志表

pb/pay.proto

@@ -14,19 +14,20 @@ message UserPayOrderVo {     //用户支付订单表
   float settleAmount = 6;   //结算金额(美元)
   string currency = 7;      //收款货币类型
   float currencyAmount = 8; //订单货币金额
-  BoolInt orderType = 9;     //订单类型：1非订阅 或者 2 订阅
-  string payType = 10;      //支付方式：visa, wx, alipay, paypal, coinpal, applePay, googlePay
-  string platform = 11;     //支付平台
-  string snNo = 12;         //支付平台流水号
-  string payUrl = 13;       //支付平台生成的付款地址
-  string paidAddress = 14;  //支付地址
-  string ip = 15;           //IP地址
-  string remark = 16;       //订单说明，可选
-  string state = 17;        //订单流转状态
-  string stateDesc = 18;    //订单状态说明，每次更新订单状态时更新
-  int32 status = 19;        //订单记录状态，1有效 2暂停
-  int64 createTime = 20;     //订单创建时间
-  int64 updateTime = 21;     //订单修改时间
+  PayOrderType orderType = 9;     //订单类型：1非订阅 或者 2 订阅
+  BoolInt planOrderType = 10;  //订单类型：1非订阅 或者 2 订阅
+  string payType = 11;      //支付方式：visa, wx, alipay, paypal, coinpal, applePay, googlePay
+  string platform = 12;     //支付平台
+  string snNo = 13;         //支付平台流水号
+  string payUrl = 14;       //支付平台生成的付款地址
+  string paidAddress = 15;  //支付地址
+  string ip = 16;           //IP地址
+  string remark = 17;       //订单说明，可选
+  string state = 18;        //订单流转状态
+  string stateDesc = 19;    //订单状态说明，每次更新订单状态时更新
+  Status status = 20;        //订单记录状态，1有效 2暂停
+  int64 createTime = 21;     //订单创建时间
+  int64 updateTime = 22;     //订单修改时间
 }
 
 message UserAuthLogVo {     //用户授权日志表