feat : 新增支付方式和商户选择列表接口

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/vo/OrderVO.java

@@ -27,6 +27,9 @@ public class OrderVO {
     @ApiModelProperty(notes = "cp订单号")
     private String cpOrderId;
 
+    @ApiModelProperty(notes = "第三方支付订单号")
+    private String merchantOrderNo;
+
     @ApiModelProperty(notes = "玩家id")
     private Long userId;
 

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/Order.java

@@ -267,7 +267,12 @@ public class Order {
     /**
      * 支付方式id
      */
-    private Integer payWayId;
+    private Long payWayId;
+
+    /**
+     * 支付配置id
+     */
+    private Long gamePayWayId;
 
     /**
      * 注册游戏id