|
@@ -75,14 +75,6 @@ public class FinTranRecordController extends BaseController
|
|
{
|
|
{
|
|
JSONObject jsonObject = finTranRecordService.selecFinTranRecordCount(finTranRecord);
|
|
JSONObject jsonObject = finTranRecordService.selecFinTranRecordCount(finTranRecord);
|
|
|
|
|
|
- if(StringUtils.isNotBlank(finTranRecord.getBeginTime())){
|
|
|
|
- finTranRecord.setBeginTime(finTranRecord.getBeginTime() + " 00:00:00");
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if(StringUtils.isNotBlank(finTranRecord.getEndTime())){
|
|
|
|
- finTranRecord.setEndTime(finTranRecord.getEndTime() + " 23:59:59");
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
// 用户总统计(游戏投注)
|
|
// 用户总统计(游戏投注)
|
|
Map<String, BigDecimal> bettingAmountSum = appGameBettingService.getBettingAmountSum(finTranRecord.getUserId());
|
|
Map<String, BigDecimal> bettingAmountSum = appGameBettingService.getBettingAmountSum(finTranRecord.getUserId());
|
|
jsonObject.put("bettingAmountSum", bettingAmountSum);
|
|
jsonObject.put("bettingAmountSum", bettingAmountSum);
|