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服务启动成功 <回传拆单更改结构02> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <回传拆单更改结构05> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

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

@@ -26,10 +26,10 @@ import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * @author : lingfeng
@@ -83,21 +83,17 @@ public class CallBackServiceImpl implements ICallBackService {
         resultMap.put("callBackTypeEnum", param.getCallBackTypeEnum().getValue());
         resultMap.put("userId", userData.getUserId());
         resultMap.put("gameId", userData.getGameId());
-
-
-        List<BigDecimal> amountList = new ArrayList<>();
-        amountList.add(new BigDecimal("10.00"));
-        amountList.add(new BigDecimal("20.00"));
-        amountList.add(new BigDecimal("30.00"));
-        resultMap.put("amount", amountList);
-
-
         //事件类型枚举
         CallBackTypeEnum callBackTypeEnum = param.getCallBackTypeEnum();
         Game game = gameService.getById(userData.getGameId());
         //判断游戏状态, 对接上包过程中, 全量回传
         if (Objects.equals(game.getStatus(), 2)) {
             resultMap.put("callBack", Boolean.TRUE);
+            List<Long> amountList = new ArrayList<>();
+            amountList.add(10L);
+            amountList.add(20L);
+            amountList.add(30L);
+            resultMap.put("amount", amountList);
             if (Objects.equals(callBackTypeEnum, CallBackTypeEnum.CALL_BACK_PAY_ORDER)) {
                 PlatformOrderDTO platformOrderDTO = orderService.getByOrderId(param.getOrderId());
                 resultMap.put("amount", Collections.singletonList(platformOrderDTO.getAmount()));
@@ -174,7 +170,11 @@ public class CallBackServiceImpl implements ICallBackService {
                 resultMap.put("callBack", orderBackQueryRpcVO.getDoBack());
                 resultMap.put("backMsg", orderBackQueryRpcVO.getBackMsg());
                 if (Objects.equals(orderBackQueryRpcVO.getDoBack(), Boolean.TRUE)) {
-                    resultMap.put("amount", orderBackQueryRpcVO.getBackMoney());
+                    //传过来的金额是分, 换算成元, 存在小数直接舍弃
+                    List<Long> backMoney = orderBackQueryRpcVO.getBackMoney()
+                            .stream().map(money -> money / 100)
+                            .collect(Collectors.toList());
+                    resultMap.put("amount", backMoney);
                 }
                 break;
             default: