From 4ee77a0ee732b1d760b08d986ab308dc8d89f6be Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期三, 01 十一月 2023 10:43:54 +0800 Subject: [PATCH] 支付会员购买bug --- cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java index 242d614..ef9dd85 100644 --- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java +++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java @@ -120,16 +120,28 @@ 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); details.add(consumeDetail); } } -// 4.智慧球场 + // 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.充值 + + // 5.充值 List<RechargeRecords> rechargeRecords = this.baseMapper.selectList(new QueryWrapper<RechargeRecords>() .eq("payStatus", 2) .eq("appUserId", appUserId) @@ -376,7 +388,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) { //计算总页数 -- Gitblit v1.7.1