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, 米大师支付回调上线1> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/pojo/dto/AppletMsgDTO.java

@@ -86,7 +86,7 @@ public class AppletMsgDTO {
         /**
          * 支付参数信息
          */
-        private PayloadBean Payload;
+        private String Payload;
 
         /**
          * 支付参数的签名算法

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

@@ -139,13 +139,16 @@ public class GameAppletServiceImpl extends ServiceImpl<GameAppletMapper, GameApp
             return successResult;
         }
         //支付内容
-        AppletMsgDTO.PayloadBean payload = miniGame.getPayload();
-        if (payload == null) {
+        String payload = miniGame.getPayload();
+        log.error("-----------> 支付信息 payload : {}", payload);
+        AppletMsgDTO.PayloadBean payloadBean = JsonUtil.toObj(payload, AppletMsgDTO.PayloadBean.class);
+        log.error("-----------> payload 对象转换成功 payloadBean : {}", JsonUtil.toString(payloadBean));
+        if (payloadBean == null) {
             log.error("米大师支付回调参数错误, 没有支付信息 appletMsgDTO : {}", JsonUtil.toString(appletMsgDTO));
             return failResult;
         }
         //商户订单号和交易订单号判断
-        AppletMsgDTO.WeChatPayInfoBean weChatPayInfo = payload.getWeChatPayInfo();
+        AppletMsgDTO.WeChatPayInfoBean weChatPayInfo = payloadBean.getWeChatPayInfo();
         if (weChatPayInfo == null || Strings.isBlank(weChatPayInfo.getMchOrderNo())
                 || Strings.isBlank(weChatPayInfo.getTransactionId())) {
             log.error("米大师支付回调参数错误, 没有支付信息 appletMsgDTO : {}", JsonUtil.toString(appletMsgDTO));
@@ -163,7 +166,7 @@ public class GameAppletServiceImpl extends ServiceImpl<GameAppletMapper, GameApp
         }
         log.error("米大师支付回调签名匹配成功, 开始计算业务数据--------------->");
         //更新订单信息
-        Boolean miPayNotifyResult = miPayService.miPayNotify(payload.getOutTradeNo(),
+        Boolean miPayNotifyResult = miPayService.miPayNotify(payloadBean.getOutTradeNo(),
                 Tuples.of(weChatPayInfo.getMchOrderNo(), weChatPayInfo.getTransactionId()));
         //放业务更新结果
         return Objects.equals(miPayNotifyResult, Boolean.TRUE) ? successResult : failResult;