Merge branch 'dev' of GameCenter/game-center into master

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/SDKApplication.java

@@ -23,7 +23,7 @@ public class SDKApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SDKApplication.class, args);
-        System.out.println("赞象SDK服务启动成功 <dubbo升级3.0, 取消自动客服消息> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <dubbo升级3.0, 测试米大师电脑端支付> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/OrderPayServiceImpl.java

@@ -134,6 +134,12 @@ public class OrderPayServiceImpl implements IOrderPayService {
                     Objects.equals(gamePayWay.getPayDeviceId(), PayDeviceEnum.MI_PAY.getPayDeviceId()))
                     .findFirst().orElse(null);
         }
+        //两个账号做测试
+        if (userData.getUserId() == 6L || userData.getUserId() == 306L) {
+            gamePayWayDTO = gamePayWayList.stream().filter(gamePayWay ->
+                    Objects.equals(gamePayWay.getPayDeviceId(), PayDeviceEnum.MI_PAY.getPayDeviceId()))
+                    .findFirst().orElse(null);
+        }
         //非android用户, 或者未适配到米大师支付, 适配小程序商城支付
         if (gamePayWayDTO == null) {
             gamePayWayDTO = gamePayWayList.stream().filter(gamePayWay ->