|
@@ -62,9 +62,6 @@ public class FinTranRecordServiceImpl extends ServiceImpl<FinTranRecordMapper, F
|
|
|
@Autowired
|
|
|
private ICfgCommonService cfgCommonService;
|
|
|
|
|
|
- @Autowired
|
|
|
- private IAppGameBettingService appGameBettingService;
|
|
|
-
|
|
|
|
|
|
* 查询消费记录
|
|
|
*
|
|
@@ -270,7 +267,8 @@ public class FinTranRecordServiceImpl extends ServiceImpl<FinTranRecordMapper, F
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public R selecFinTranRecordCount(FinTranRecordDTO finTranRecordDTO) {
|
|
|
+ @DataSource(DataSourceType.SLAVE)
|
|
|
+ public JSONObject selecFinTranRecordCount(FinTranRecordDTO finTranRecordDTO) {
|
|
|
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
|
|
@@ -278,10 +276,6 @@ public class FinTranRecordServiceImpl extends ServiceImpl<FinTranRecordMapper, F
|
|
|
Map<String, BigDecimal> userCount = appUserService.getUserCount(finTranRecordDTO.getUserId());
|
|
|
jsonObject.put("userCount", userCount);
|
|
|
|
|
|
-
|
|
|
- Map<String, BigDecimal> bettingAmountSum = appGameBettingService.getBettingAmountSum(finTranRecordDTO.getUserId());
|
|
|
- jsonObject.put("bettingAmountSum", bettingAmountSum);
|
|
|
-
|
|
|
|
|
|
Map<String, BigDecimal> rechargeCount = finTranRecordMapper.getRechargeSum(finTranRecordDTO.getUserId());
|
|
|
jsonObject.put("rechargeCount", rechargeCount);
|
|
@@ -294,10 +288,6 @@ public class FinTranRecordServiceImpl extends ServiceImpl<FinTranRecordMapper, F
|
|
|
BigDecimal withdraw = finTranRecordMapper.getWithdrawSum(finTranRecordDTO.getUserId());
|
|
|
jsonObject.put("withdraw", withdraw);
|
|
|
|
|
|
-
|
|
|
- Map<String, BigDecimal> bettingAmountDateSum = appGameBettingService.getBettingAmountByDateSum(finTranRecordDTO);
|
|
|
- jsonObject.put("bettingAmountDateSum", bettingAmountDateSum);
|
|
|
-
|
|
|
|
|
|
List<Map<String, Object>> rechargeByDateSum = finTranRecordMapper.getRechargeByDateSum(finTranRecordDTO);
|
|
|
if(rechargeByDateSum == null){
|
|
@@ -312,6 +302,7 @@ public class FinTranRecordServiceImpl extends ServiceImpl<FinTranRecordMapper, F
|
|
|
withdrawByDateSum = new ArrayList<>();
|
|
|
}
|
|
|
jsonObject.put("withdrawByDateSum", withdrawByDateSum);
|
|
|
- return R.ok(jsonObject);
|
|
|
+
|
|
|
+ return jsonObject;
|
|
|
}
|
|
|
}
|