From b2821983d284dfb7985cdf67c5dd17613df11667 Mon Sep 17 00:00:00 2001 From: wangguorui <2069821375@qq.com> Date: Sat, 7 Feb 2026 10:41:04 +0800 Subject: [PATCH] =?UTF-8?q?2=E6=9C=887=E6=97=A5=EF=BC=8C=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=BA=BA=E6=94=B6=E5=88=B0=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/RabbitMQ/CoinRechargeAspect.java | 1 - src/main/java/com/example/demo/config/RabbitMQConfig.java | 2 +- .../java/com/example/demo/controller/cash/MessageController.java | 9 ++++++--- src/main/java/com/example/demo/domain/vo/coin/Messages.java | 2 +- src/main/java/com/example/demo/mapper/cash/MessageMapper.java | 2 +- .../java/com/example/demo/mapper/coin/OperationLogMapper.java | 4 ++-- src/main/java/com/example/demo/service/cash/MessageService.java | 2 +- .../com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java | 9 +++++++-- .../com/example/demo/serviceImpl/cash/MessageServiceImpl.java | 4 ++-- src/main/resources/cashMapper/MessageMapper.xml | 4 ++++ 10 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/example/demo/RabbitMQ/CoinRechargeAspect.java b/src/main/java/com/example/demo/RabbitMQ/CoinRechargeAspect.java index 61bc9b4..897aaf3 100644 --- a/src/main/java/com/example/demo/RabbitMQ/CoinRechargeAspect.java +++ b/src/main/java/com/example/demo/RabbitMQ/CoinRechargeAspect.java @@ -81,7 +81,6 @@ public class CoinRechargeAspect { messageDTO.setName(name); messageDTO.setTitle(action); messageDTO.setDesc(username + "有一条金币充值消息需要处理"); - messageDTO.setQueryId(6); // ✅ 发送消息到 RabbitMQ（不等待） try { diff --git a/src/main/java/com/example/demo/config/RabbitMQConfig.java b/src/main/java/com/example/demo/config/RabbitMQConfig.java index 314f917..2e63787 100644 --- a/src/main/java/com/example/demo/config/RabbitMQConfig.java +++ b/src/main/java/com/example/demo/config/RabbitMQConfig.java @@ -19,7 +19,7 @@ public class RabbitMQConfig { public static final String LOG_EXCHANGE = "operation_log_exchange"; public static final String CASH_COLLECTION_QUEUE = "cash_collection_queue"; public static final String CASH_COLLECTION_EXCHANGE = "cash_collection_exchange"; - public static final String CASH_REFUND_QUEUE = "cash_refund_exchange"; + public static final String CASH_REFUND_QUEUE = "cash_refund_queue"; public static final String CASH_REFUND_EXCHANGE = "cash_refund_exchange"; public static final String COIN_REFUND_QUEUE = "coin_refund_queue"; public static final String COIN_REFUND_EXCHANGE = "coin_refund_exchange"; diff --git a/src/main/java/com/example/demo/controller/cash/MessageController.java b/src/main/java/com/example/demo/controller/cash/MessageController.java index 0d48a2f..4fdc866 100644 --- a/src/main/java/com/example/demo/controller/cash/MessageController.java +++ b/src/main/java/com/example/demo/controller/cash/MessageController.java @@ -56,12 +56,15 @@ public class MessageController { List userMarkets = Arrays.asList(StringUtils.split(admin.getMarkets(), ",")); List markets = marketService.getMarketIds(userMarkets); + // 获取当前用户的 executor + Integer executor = Integer.valueOf(admin.getAccount()); + // 解析语言代码 String languageCode = parseLanguageCode(lang); // 如果不是中文环境，将查询条件中的翻译文本转换为中文简体 if (!"zh".equalsIgnoreCase(languageCode) && !"zh_cn".equalsIgnoreCase(languageCode)) { - List messages = messageService.getMessage(markets, status.getStatus()); - for (com.example.demo.domain.vo.coin.Messages message : messages) { + List messages = messageService.getMessage(markets, status.getStatus(), executor); + for (Messages message : messages) { convertTranslatedFieldsToChinese(message, languageCode); } } @@ -71,7 +74,7 @@ public class MessageController { markets = null; } - List messages = messageService.getMessage(markets, status.getStatus()); + List messages = messageService.getMessage(markets, status.getStatus(), executor); // 对返回结果进行多语言转换 translateMessages(messages, lang); return Result.success(messages); diff --git a/src/main/java/com/example/demo/domain/vo/coin/Messages.java b/src/main/java/com/example/demo/domain/vo/coin/Messages.java index 24bf0b3..52bf7ef 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/Messages.java +++ b/src/main/java/com/example/demo/domain/vo/coin/Messages.java @@ -34,5 +34,5 @@ public class Messages { private Integer flag; private String marketName; private Integer queryId; - + private Integer executor; //执行人OA号 } diff --git a/src/main/java/com/example/demo/mapper/cash/MessageMapper.java b/src/main/java/com/example/demo/mapper/cash/MessageMapper.java index 81cd7c8..1418b61 100644 --- a/src/main/java/com/example/demo/mapper/cash/MessageMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/MessageMapper.java @@ -16,7 +16,7 @@ import java.util.List; **/ @Mapper public interface MessageMapper { - List getMessage(List markets, List status); + List getMessage(List markets, List status, Integer executor); void update(Integer id); } diff --git a/src/main/java/com/example/demo/mapper/coin/OperationLogMapper.java b/src/main/java/com/example/demo/mapper/coin/OperationLogMapper.java index a107ed5..155b988 100644 --- a/src/main/java/com/example/demo/mapper/coin/OperationLogMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/OperationLogMapper.java @@ -10,8 +10,8 @@ public interface OperationLogMapper { @Insert("INSERT INTO operation_log (user_id, username, action, ip, method, args, create_time) " + "VALUES (#{userId}, #{username}, #{action}, #{ip}, #{method}, #{args}, NOW())") void insertLog(OperationLog log); - @Insert("INSERT INTO message (jwcode, name, title, `desc`, status, type, type_id, market, query_id) " + - "VALUES (#{jwcode}, #{name}, #{title}, #{desc}, #{status}, #{type}, #{typeId}, #{market}, #{queryId})") + @Insert("INSERT INTO message (jwcode, name, title, `desc`, status, type, type_id, market, query_id, executor) " + + "VALUES (#{jwcode}, #{name}, #{title}, #{desc}, #{status}, #{type}, #{typeId}, #{market}, #{queryId}, #{executor})") void insertMessage(Messages message); @Options( useGeneratedKeys = true, // ✅ 告诉 MyBatis 使用数据库生成的主键 diff --git a/src/main/java/com/example/demo/service/cash/MessageService.java b/src/main/java/com/example/demo/service/cash/MessageService.java index 8e51301..5e12c09 100644 --- a/src/main/java/com/example/demo/service/cash/MessageService.java +++ b/src/main/java/com/example/demo/service/cash/MessageService.java @@ -16,7 +16,7 @@ import java.util.List; **/ @Service public interface MessageService { - List getMessage(List markets, List status); + List getMessage(List markets, List status, Integer executor); void update(Integer id) throws Exception; } 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 0229118..1b8a28b 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -23,6 +23,7 @@ import com.example.demo.mapper.coin.RefundMapper; import com.example.demo.service.cash.RefundService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -47,7 +48,7 @@ import static org.apache.commons.lang3.StringUtils.substring; * @Version 1.0 **/ @Service - +@Slf4j public class CashRefundServiceImpl implements RefundService { @Autowired @@ -447,7 +448,11 @@ public class CashRefundServiceImpl implements RefundService { String marketName = marketMapper.getMarketNameById(String.valueOf(message.getMarket())); message.setMarketName(marketName); message.setQueryId(cashRecordDTO.getStatus() != 32 ? 115:99); - + if (cashRecordDTO.getStatus() != 32) { + log.info("Setting executor to: {}", cashRecordDTO.getExecutor()); + message.setExecutor(cashRecordDTO.getExecutor()); + log.info("Executor after setting: {}", message.getExecutor()); + } rabbitTemplate.convertAndSend(RabbitMQConfig.CASH_REFUND_EXCHANGE, "cash.refund.save", message); } return (result > 0 ? Result.success("提交成功") : Result.error("提交失败")).getCode(); diff --git a/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java index ff3e85a..7bf03e0 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java @@ -23,11 +23,11 @@ public class MessageServiceImpl implements MessageService { @Autowired private MessageMapper messageMapper; @Override - public List getMessage(List markets, List status) { + public List getMessage(List markets, List status,Integer executor) { if(status== null|| status.size()==0){ status.add(99); } - return messageMapper.getMessage(markets, status) ; + return messageMapper.getMessage(markets, status, executor) ; } @Override diff --git a/src/main/resources/cashMapper/MessageMapper.xml b/src/main/resources/cashMapper/MessageMapper.xml index d187aa0..6da84bf 100644 --- a/src/main/resources/cashMapper/MessageMapper.xml +++ b/src/main/resources/cashMapper/MessageMapper.xml @@ -20,6 +20,7 @@ m.flag, m.cz_time, m.query_id, + m.executor, mk.name AS market_name FROM message m LEFT JOIN market mk ON m.market = mk.id @@ -37,6 +38,9 @@ #{item} + + AND m.executor = #{executor} + ORDER BY m.cz_time DESC