From 6ec6ee8a85412743295d19431157639b1f21bed1 Mon Sep 17 00:00:00 2001 From: wangguorui <2069821375@qq.com> Date: Fri, 30 Jan 2026 14:31:34 +0800 Subject: [PATCH] =?UTF-8?q?1=E6=9C=8830=E6=97=A5=EF=BC=8C=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=8E=A8=E9=80=81over?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java | 2 +- .../example/demo/serviceImpl/cash/CashAuditServiceImpl.java | 2 +- .../demo/serviceImpl/cash/CashCollectionServiceImpl.java | 7 ++++--- .../example/demo/serviceImpl/cash/CashRefundServiceImpl.java | 10 +++++----- .../com/example/demo/serviceImpl/coin/RechargeServiceImpl.java | 2 +- .../com/example/demo/serviceImpl/coin/RefundServiceImpl.java | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java index 858c3ff..9f5a04f 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java @@ -109,7 +109,7 @@ public class BeanRechargeServiceImpl implements BeanRechargeService { message.setName(user.getName()); message.setStatus(30); message.setType(0); - message.setDesc(user.getName() + "的金豆充值收款申请待审核，前往处理"); + message.setDesc("的金豆充值收款申请待审核，前往处理"); message.setTitle("金币管理--财务审核--金豆审核"); message.setTypeId(recharge.getId()); diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java index 2a85e66..2a4e26b 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java @@ -201,7 +201,7 @@ public class CashAuditServiceImpl implements CashAuditService { message.setJwcode(order.getJwcode()); message.setName(order.getName()); message.setStatus(updateOrder.getStatus()); - message.setDesc(order.getName() + (action==1?"的收款记录需补充手续费，前往填写":"的现金收款申请已被驳回，前往查看驳回理由")); + message.setDesc(action==1?"的收款记录需补充手续费，前往填写":"的现金收款申请已被驳回，前往查看驳回理由"); message.setTitle(action==1?"现金管理--收款处理":"现金管理--收款提交"); message.setType(0); message.setTypeId(order.getId()); diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index 12afcce..f81d900 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -140,7 +140,7 @@ public class CashCollectionServiceImpl implements CashCollectionService { message.setJwcode(cashRecord.getJwcode()); message.setName(cashRecord.getName()); message.setStatus(cashRecord.getStatus()); - message.setDesc(cashRecord.getName()+"的现金收款申请待审核，请前往审核"); + message.setDesc("的现金收款申请待审核，请前往审核"); message.setTitle("现金管理--收款处理"); message.setType(0); message.setTypeId(cashRecord.getId()); @@ -194,13 +194,14 @@ public class CashCollectionServiceImpl implements CashCollectionService { message.setJwcode(cashRecord.getJwcode()); message.setName(cashRecord.getName()); message.setStatus(cashRecord.getStatus()); - message.setDesc(cashRecord.getName()+"用户的现金收款申请待审核，请前往审核"); - message.setTitle("现金收款--赠送免费金币"); + message.setDesc("用户的现金收款申请待审核，请前往审核"); + message.setTitle("现金收款--现金收款"); message.setType(1); message.setTypeId(cashRecord.getId()); message.setMarket(Integer.valueOf(cashRecord.getMarket())); String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket())); message.setMarketName(marketName); + message.setQueryId(67); rabbitTemplate.convertAndSend(RabbitMQConfig.CASH_COLLECTION_EXCHANGE, "cash.collection.save", message); return "添加成功"; } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index c55e79d..a400367 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -211,7 +211,7 @@ public class CashRefundServiceImpl implements RefundService { message.setJwcode(cashRecordRefund.getJwcode()); message.setName(cashRecordRefund.getName()); message.setStatus(cashRecordRefund.getStatus()); - message.setDesc(cashRecordRefund.getName() + "的线上退款申请待审批，前往确认"); + message.setDesc("的线上退款申请待审批，前往确认"); message.setTitle("现金退款--新增退款"); message.setType(0); message.setTypeId(cashRecordRefund.getId()); @@ -256,7 +256,7 @@ public class CashRefundServiceImpl implements RefundService { message.setJwcode(cashRecordDTO.getJwcode()); message.setName(cashRecordDTO.getName()); message.setStatus(cashRecordDTO.getStatus()); - message.setDesc(cashRecordDTO.getName() + "的退款申请待审核，前往处理"); + message.setDesc("的退款申请待审核，前往处理"); message.setTitle("现金管理--退款审批"); message.setType(1); message.setTypeId(cashRecordDTO.getId()); @@ -297,7 +297,7 @@ public class CashRefundServiceImpl implements RefundService { message.setJwcode(cashRecordDTO.getJwcode()); message.setName(cashRecordDTO.getName()); message.setStatus(cashRecordDTO.getStatus()); - message.setDesc(cashRecordDTO.getName()+(cashRecordDTO.getStatus()!=12 && cashRecordDTO.getStatus()!=22?"的退款申请待审核，前往处理":"的现金退款申请已被驳回，前往查看详情")); + message.setDesc(cashRecordDTO.getStatus()!=12 && cashRecordDTO.getStatus()!=22?"的退款申请待审核，前往处理":"的现金退款申请已被驳回，前往查看详情"); message.setTitle(cashRecordDTO.getStatus()!=12 && cashRecordDTO.getStatus()!=22?"现金管理--退款审批":"现金管理--退款提交"); message.setType(1); message.setTypeId(cashRecordDTO.getId()); @@ -417,7 +417,7 @@ public class CashRefundServiceImpl implements RefundService { message1.setJwcode(cashRecordDone.getJwcode()); message1.setName(cashRecordDone.getName()); message1.setStatus(cashRecordDone.getStatus()); - message1.setDesc(cashRecordDone.getName() + "的退款记录需填写执行明细，前往查看处理"); + message1.setDesc("的退款记录需填写执行明细，前往查看处理"); message1.setTitle("现金管理--执行明细填写"); message1.setType(1); message1.setTypeId(cashRecordDone.getId()); @@ -436,7 +436,7 @@ public class CashRefundServiceImpl implements RefundService { message.setJwcode(cashRecordDTO.getJwcode()); message.setName(cashRecordDTO.getName()); message.setStatus(cashRecordDTO.getStatus()); - message.setDesc(cashRecordDTO.getName() + (cashRecordDTO.getStatus() != 32 ? "的退款申请待审核，前往处理" : "的现金退款申请已被驳回，前往查看详情")); + message.setDesc(cashRecordDTO.getStatus() != 32 ? "的退款申请待审核，前往处理" : "的现金退款申请已被驳回，前往查看详情"); message.setTitle(cashRecordDTO.getStatus() != 32 ? "现金管理--退款审批":"现金管理--退款提交"); message.setType(1); message.setTypeId(cashRecordDTO.getId()); diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java index 036bf9f..f2e1e8c 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java @@ -157,7 +157,7 @@ public class RechargeServiceImpl implements RechargeService { message.setJwcode(rechargeUser.getJwcode()); message.setName(goldUser.getName()); message.setStatus(10); - message.setDesc(goldUser.getName() + "的金币充值收款申请待审核，前往处理"); + message.setDesc("的金币充值收款申请待审核，前往处理"); message.setTitle("金币管理--金币审核--充值审核"); message.setType(0); message.setTypeId(userGoldRecord.getId()); diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java index 14d3f3d..b454e78 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java @@ -232,7 +232,7 @@ public class RefundServiceImpl implements RefundService { message.setJwcode(refundUser.getJwcode()); message.setName(goldUser.getName()); message.setStatus(10); - message.setDesc(goldUser.getName() + "的金币退款申请待审核，前往确认"); + message.setDesc("的金币退款申请待审核，前往确认"); message.setTitle("金币管理--金币审核--退款审核"); message.setType(1); message.setTypeId(userGoldRecord.getId());