liujie
2023-10-20 1e790795f4e2c365f604ecc0fc1b290e3ff3c35f
cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
@@ -120,7 +120,7 @@
        if (siteBookings.size() > 0 ){
            for (SiteBooking booking : siteBookings) {
                RechargesDetail consumeDetail = new RechargesDetail();
                consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.name());
                consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.getMsg());
                consumeDetail.setConsumeTime(simpleDateFormat.format(booking.getInsertTime()));
                consumeDetail.setConsumeAmount("-" + booking.getPayMoney());
                consumeDetail.setRecordId(2);
@@ -128,6 +128,19 @@
            }
        }
//            4.智慧球场
        List<Map<String,Object>> list = stClient.game(appUserId);
        if (list.size() > 0 ){
            for (Map<String,Object> booking : list) {
                RechargesDetail consumeDetail = new RechargesDetail();
                consumeDetail.setConsumeName("激战游戏");
                consumeDetail.setConsumeTime(simpleDateFormat.format(new Date(Long.valueOf(booking.get("time").toString()))));
                consumeDetail.setConsumeAmount("-"+String.valueOf(booking.get("money")));
                consumeDetail.setRecordId(2);
                details.add(consumeDetail);
            }
        }
//            5.充值
        List<RechargeRecords> rechargeRecords = this.baseMapper.selectList(new QueryWrapper<RechargeRecords>()
@@ -376,7 +389,7 @@
            STime = query.getTime().split(" - ")[0] + " 00:00:00";
            ETime = query.getTime().split(" - ")[1] + " 23:59:59";
        }
        return rechargeRecordsMapper.listAll(query,STime,ETime,query.getAmount());
        return rechargeRecordsMapper.listAll(query,STime,ETime,query.getAmount(),query.getInsertType());
    }
    public static <T> List<T> pageList(List<T> list, int pageNum, int pageSize) {
        //计算总页数