Przeglądaj źródła

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

zhimo 1 rok temu
rodzic
commit
512ba97bbb

+ 1 - 1
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, 米大师支付回调上线1> ( ´・・)ノ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <dubbo升级3.0, 米大师支付回调上线2> ( ´・・)ノ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

+ 9 - 3
game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/GameAppletServiceImpl.java

@@ -33,7 +33,6 @@ import reactor.util.function.Tuples;
 
 import java.math.BigDecimal;
 import java.net.URI;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -130,12 +129,19 @@ public class GameAppletServiceImpl extends ServiceImpl<GameAppletMapper, GameApp
 
     private String miPayMessage(AppletMsgDTO appletMsgDTO, GameAppletDTO gameAppletDTO) {
         log.error("米大师支付回调 appletMsgDTO : {}", JsonUtil.toString(appletMsgDTO));
-        String failResult = JsonUtil.toString(Collections.singletonMap(99999L, "internal error"));
-        String successResult = JsonUtil.toString(Collections.singletonMap(0L, "Success"));
+        Map<String, Object> failResultMap = new HashMap<>(2);
+        failResultMap.put("ErrCode", 99999L);
+        failResultMap.put("ErrMsg", "internal error");
+        String failResult = JsonUtil.toString(failResultMap);
+        Map<String, Object> successResultMap = new HashMap<>(2);
+        successResultMap.put("ErrCode", 0L);
+        successResultMap.put("ErrMsg", "Success");
+        String successResult = JsonUtil.toString(successResultMap);
         //通知内容
         AppletMsgDTO.MiniGameBean miniGame = appletMsgDTO.getMiniGame();
         //判断是否为模拟数据, 模拟数据直接返回, 不进行业务处理
         if (Objects.equals(miniGame.getIsMock(), Boolean.TRUE)) {
+            log.error("模拟调试返回返回成功, 返回结果 successResult : {}", successResult);
             return successResult;
         }
         //支付内容