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

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameOceanengineAppOrderLogServiceImpl.java

@@ -24,6 +24,7 @@ import com.zanxiang.game.back.serve.utils.OrderUtil;
 import com.zanxiang.game.module.base.ServerInfo;
 import com.zanxiang.game.module.base.pojo.vo.AgentRpcVO;
 import com.zanxiang.game.module.base.rpc.IAgentRpc;
+import com.zanxiang.module.util.ObjectUtil;
 import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -434,7 +435,7 @@ public class GameOceanengineAppOrderLogServiceImpl extends ServiceImpl<GameOcean
 
         @Override
         public Long totalRechargeAmount() {
-            return gameOceanengineAppOrderLogService.getOne(new QueryWrapper<GameOceanengineAppOrderLog>()
+            Map<String, Object> data = gameOceanengineAppOrderLogService.getMap(new QueryWrapper<GameOceanengineAppOrderLog>()
                     .select("ifnull(sum(amount), 0) as amount").lambda()
                     .eq(GameOceanengineAppOrderLog::getGameId, orderLog.getGameId())
                     .eq(GameOceanengineAppOrderLog::getAccountId, orderLog.getAccountId())
@@ -442,7 +443,8 @@ public class GameOceanengineAppOrderLogServiceImpl extends ServiceImpl<GameOcean
                     .eq(GameOceanengineAppOrderLog::getOrderStatus, OrderStatusEnum.SUCCESS_PAY.getValue())
                     .eq(GameOceanengineAppOrderLog::getUserId, userLog.getUserId())
                     .ne(GameOceanengineAppOrderLog::getOrderNo, orderLog.getOrderNo())
-            ).getAmount();
+            );
+            return ObjectUtil.objToLong(data.get("amount"), 0L);
         }
     }
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameOceanengineOrderLogServiceImpl.java

@@ -33,6 +33,7 @@ import com.zanxiang.game.module.base.pojo.vo.AgentRpcVO;
 import com.zanxiang.game.module.base.rpc.IAgentRpc;
 import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.module.util.NumberUtil;
+import com.zanxiang.module.util.ObjectUtil;
 import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
@@ -536,7 +537,7 @@ public class GameOceanengineOrderLogServiceImpl extends ServiceImpl<GameOceaneng
 
         @Override
         public Long totalRechargeAmount() {
-            return gameOceanengineOrderLogService.getOne(new QueryWrapper<GameOceanengineOrderLog>()
+            Map<String, Object> data = gameOceanengineOrderLogService.getMap(new QueryWrapper<GameOceanengineOrderLog>()
                     .select("ifnull(sum(amount), 0) as amount").lambda()
                     .eq(GameOceanengineOrderLog::getGameId, orderLog.getGameId())
                     .eq(GameOceanengineOrderLog::getAppId, orderLog.getAppId())
@@ -545,7 +546,8 @@ public class GameOceanengineOrderLogServiceImpl extends ServiceImpl<GameOceaneng
                     .eq(GameOceanengineOrderLog::getOrderStatus, OrderStatusEnum.SUCCESS_PAY.getValue())
                     .eq(GameOceanengineOrderLog::getOpenId, orderLog.getOpenId())
                     .ne(GameOceanengineOrderLog::getOrderNo, orderLog.getOrderNo())
-            ).getAmount();
+            );
+            return ObjectUtil.objToLong(data.get("amount"), 0L);
         }
     }
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppApiOrderServiceImpl.java

@@ -22,6 +22,7 @@ import com.zanxiang.game.back.serve.service.*;
 import com.zanxiang.game.back.serve.utils.BackPolicyUtil;
 import com.zanxiang.module.util.DateUtil;
 import com.zanxiang.module.util.NumberUtil;
+import com.zanxiang.module.util.ObjectUtil;
 import com.zanxiang.module.util.URIUtil;
 import com.zanxiang.module.util.encryption.Md5Util;
 import com.zanxiang.module.util.exception.BaseException;
@@ -459,7 +460,7 @@ implements IGameTencentAppApiOrderService {
 
         @Override
         public Long totalRechargeAmount() {
-            return gameTencentAppApiOrderService.count(new QueryWrapper<GameTencentAppApiOrder>()
+            Map<String, Object> data = gameTencentAppApiOrderService.getMap(new QueryWrapper<GameTencentAppApiOrder>()
                     .select("ifnull(sum(recharge_money), 0) as recharge_money").lambda()
                     .eq(GameTencentAppApiOrder::getGameId, orderLog.getGameId())
                     .eq(GameTencentAppApiOrder::getAdAccountId, orderLog.getAdAccountId())
@@ -468,6 +469,7 @@ implements IGameTencentAppApiOrderService {
                     .eq(GameTencentAppApiOrder::getUserId, orderLog.getUserId())
                     .ne(GameTencentAppApiOrder::getOrderId, orderLog.getOrderId())
             );
+            return ObjectUtil.objToLong(data.get("recharge_money"), 0L);
         }
     }
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentMiniGameOrderServiceImpl.java

@@ -36,6 +36,7 @@ import com.zanxiang.game.module.base.ServerInfo;
 import com.zanxiang.game.module.base.pojo.vo.AgentRpcVO;
 import com.zanxiang.game.module.base.rpc.IAgentRpc;
 import com.zanxiang.module.util.NumberUtil;
+import com.zanxiang.module.util.ObjectUtil;
 import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
@@ -473,7 +474,7 @@ public class GameTencentMiniGameOrderServiceImpl extends ServiceImpl<GameTencent
 
         @Override
         public Long totalRechargeAmount() {
-            return gameTencentMiniGameOrderService.getOne(new QueryWrapper<GameTencentMiniGameOrder>()
+            Map<String, Object> data = gameTencentMiniGameOrderService.getMap(new QueryWrapper<GameTencentMiniGameOrder>()
                     .select("ifnull(sum(recharge_money), 0) as recharge_money").lambda()
                     .eq(GameTencentMiniGameOrder::getGameId, orderLog.getGameId())
                     .eq(GameTencentMiniGameOrder::getWechatAppId, orderLog.getWechatAppId())
@@ -482,7 +483,8 @@ public class GameTencentMiniGameOrderServiceImpl extends ServiceImpl<GameTencent
                     .eq(GameTencentMiniGameOrder::getOrderStatus, OrderStatusEnum.SUCCESS_PAY.getValue())
                     .eq(GameTencentMiniGameOrder::getWechatOpenid, orderLog.getWechatOpenid())
                     .ne(GameTencentMiniGameOrder::getOrderId, orderLog.getOrderId())
-            ).getRechargeMoney();
+            );
+            return ObjectUtil.objToLong(data.get("recharge_money"), 0L);
         }
     }
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentOrderServiceImpl.java

@@ -40,6 +40,7 @@ import com.zanxiang.game.module.base.ServerInfo;
 import com.zanxiang.game.module.base.pojo.vo.AgentRpcVO;
 import com.zanxiang.game.module.base.rpc.IAgentRpc;
 import com.zanxiang.module.util.NumberUtil;
+import com.zanxiang.module.util.ObjectUtil;
 import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import com.zanxiang.module.util.pojo.ResultVO;
@@ -532,7 +533,7 @@ public class GameTencentOrderServiceImpl extends ServiceImpl<GameTencentOrderMap
 
         @Override
         public Long totalRechargeAmount() {
-            return gameTencentOrderService.count(new QueryWrapper<GameTencentOrder>()
+            Map<String, Object> data = gameTencentOrderService.getMap(new QueryWrapper<GameTencentOrder>()
                     .select("ifnull(sum(recharge_money), 0) as recharge_money").lambda()
                     .eq(GameTencentOrder::getGameId, orderLog.getGameId())
                     .eq(GameTencentOrder::getWechatAppId, orderLog.getWechatAppId())
@@ -542,6 +543,7 @@ public class GameTencentOrderServiceImpl extends ServiceImpl<GameTencentOrderMap
                     .eq(GameTencentOrder::getWechatOpenid, orderLog.getWechatOpenid())
                     .ne(GameTencentOrder::getOrderId, orderLog.getOrderId())
             );
+            return ObjectUtil.objToLong(data.get("recharge_money"), 0L);
         }
     }
 }