From ae9bfd2d66f68a553786ac78b12f4390e65e4e09 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期五, 24 十一月 2023 18:30:18 +0800 Subject: [PATCH] 后台bug修改 --- cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 38 insertions(+), 17 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 4349abc..07c168f 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 @@ -96,12 +96,32 @@ List<PaymentCompetition> playPaiFGoldPayRecord = deducClient.getPlayPaiFGoldPayRecord(appUserId); if (playPaiFGoldPayRecord.size() > 0 ){ for (PaymentCompetition competition : playPaiFGoldPayRecord) { - RechargesDetail consumeDetail = new RechargesDetail(); - consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg() ); - consumeDetail.setConsumeTime(simpleDateFormat.format(competition.getInsertTime())); - consumeDetail.setConsumeAmount("-" + competition.getAmount()); - consumeDetail.setRecordId(2); - details.add(consumeDetail); + if (competition.getPayStatus()==2) { + RechargesDetail consumeDetail = new RechargesDetail(); + consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg()); + consumeDetail.setConsumeTime(simpleDateFormat.format(competition.getInsertTime())); + consumeDetail.setConsumeAmount("-" + competition.getAmount()); + consumeDetail.setRecordId(2); + details.add(consumeDetail); + }else { + + + RechargesDetail consumeDetail1 = new RechargesDetail(); + consumeDetail1.setConsumeName(RechargeRecordEnum.CANCEL_EVENT_REGISTRATION.getMsg()); + consumeDetail1.setConsumeTime(simpleDateFormat.format(competition.getRefundTime())); + consumeDetail1.setConsumeAmount("+" + competition.getAmount()); + consumeDetail1.setRecordId(1); + details.add(consumeDetail1); + + RechargesDetail consumeDetail = new RechargesDetail(); + consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg()); + consumeDetail.setConsumeTime(simpleDateFormat.format(competition.getInsertTime())); + consumeDetail.setConsumeAmount("-" + competition.getAmount()); + consumeDetail.setRecordId(2); + details.add(consumeDetail); + + + } } } // 2.课包购买 @@ -150,9 +170,9 @@ if (rechargeRecords.size() > 0) { for (RechargeRecords rechargeRecord : rechargeRecords) { RechargesDetail consumeDetail = new RechargesDetail(); - consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.getMsg() + ":" + rechargeRecord.getPlayPaiCoins()); + consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.getMsg() + ":¥" + rechargeRecord.getAmount()); consumeDetail.setConsumeTime(simpleDateFormat.format(rechargeRecord.getInsertTime())); - consumeDetail.setConsumeAmount("+" + rechargeRecord.getAmount()); + consumeDetail.setConsumeAmount("+" + rechargeRecord.getPlayPaiCoins()); consumeDetail.setRecordId(1); details.add(consumeDetail); } @@ -301,15 +321,16 @@ records.setOrderNumber(tradeNo); rereMapper.updateById(records); -// RechargeRecords rechargeRecords = rereMapper.selectOne(new QueryWrapper<RechargeRecords>() -// .eq("code", code)); -// if (rechargeRecords.getPayStatus() == 2){ -// break; -// } -// -// TAppUser tAppUser = tappMapper.selectById(rechargeRecords.getAppUserId()); -// tAppUser.setPlayPaiCoins(null == tAppUser.getPlayPaiCoins()? rechargeRecords.getPlayPaiCoins(): tAppUser.getPlayPaiCoins() +rechargeRecords.getPlayPaiCoins() ); -// tappMapper.updateById(tAppUser); + RechargeRecords rechargeRecords = rereMapper.selectOne(new QueryWrapper<RechargeRecords>() + .eq("code", code)); + if (rechargeRecords.getPayStatus() == 2){ + TAppUser tAppUser = tappMapper.selectById(rechargeRecords.getAppUserId()); + tAppUser.setPlayPaiCoins(null == tAppUser.getPlayPaiCoins()? rechargeRecords.getPlayPaiCoins(): tAppUser.getPlayPaiCoins() +rechargeRecords.getPlayPaiCoins() ); + tappMapper.updateById(tAppUser); + break; + } + + break; -- Gitblit v1.7.1