Merge remote-tracking branch 'origin/package' into dev

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, 小游戏回传修改11> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <dubbo升级3.0, 回调CP异常处理> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/listener/OrderPaySuccessListener.java

@@ -50,7 +50,11 @@ public class OrderPaySuccessListener {
             return;
         }
         //cp推送
-        performOrderService.pushCp(platformOrderDTO);
+        try {
+            performOrderService.pushCp(platformOrderDTO);
+        } catch (Exception e) {
+            log.error("充值回调CP异常, orderId : {}, e : {}", platformOrderDTO.getOrderId(), e.getMessage());
+        }
         //用户充值统计更新
         performOrderService.userRechargeTotal(platformOrderDTO);
         //用户首冲统计

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

@@ -100,7 +100,7 @@ public class PerformOrderServiceImpl implements IPerformOrderService {
             resultStr = restTemplate.getForObject(url, String.class);
         } catch (Exception e) {
             log.error("回调CP充值接口异常, orderInfo : {}, e : {}", JsonUtil.toString(orderInfo), e.getMessage());
-            throw new BaseException("回调CP充值接口异常");
+            return false;
         }
         PushCpResult pushCpResult = JsonUtil.toObj(resultStr, PushCpResult.class);
         boolean pushSuccess = Objects.equals(pushCpResult.getResult(), PushCpResult.SUCCESS_CODE);