From d05fe1001f4d1c29bcfc557adf79ff62a92a6a5f Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Wed, 19 Nov 2025 15:04:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/mapper/coin/MarketMapper.java | 2 +- .../demo/serviceImpl/cash/CashRefundServiceImpl.java | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/example/demo/mapper/coin/MarketMapper.java b/src/main/java/com/example/demo/mapper/coin/MarketMapper.java index 5b78fe5..cbacf11 100644 --- a/src/main/java/com/example/demo/mapper/coin/MarketMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/MarketMapper.java @@ -19,5 +19,5 @@ public interface MarketMapper { Market getMarketIdBytype(String market); String getMarketById(String market); //获取市场id - List getMarketByIds(@Param("marketIds") Set marketIds); + List getMarketByIds(@Param("marketIds") Set marketIds); } \ No newline at end of file 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 09f16b2..2a4688c 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -3,12 +3,10 @@ import com.example.demo.domain.entity.Admin; import com.example.demo.Util.BusinessException; import com.example.demo.Util.GoldTistV2; import com.example.demo.config.RabbitMQConfig; +import com.example.demo.domain.entity.Market; import com.example.demo.domain.entity.User; import com.example.demo.domain.entity.UserGoldRecord; -import com.example.demo.domain.vo.cash.CashRecordDTO; -import com.example.demo.domain.vo.cash.CashRecordDone; -import com.example.demo.domain.vo.cash.CashRecordRefund; -import com.example.demo.domain.vo.cash.CashRefundMessage; +import com.example.demo.domain.vo.cash.*; import com.example.demo.domain.vo.coin.Messages; import com.example.demo.domain.vo.coin.Result; import com.example.demo.exception.SystemException; @@ -16,10 +14,12 @@ import com.example.demo.mapper.cash.CashCollectionMapper; import com.example.demo.mapper.cash.CashRefundMapper; import com.example.demo.mapper.coin.AuditMapper; import com.example.demo.mapper.coin.MarketMapper; +import com.example.demo.mapper.coin.OperationLogMapper; 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 org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -56,6 +56,8 @@ public class CashRefundServiceImpl implements RefundService { private RabbitTemplate rabbitTemplate; @Autowired private OperationLogMapper operationLogMapper; + @Autowired + private CashCollectionMapper cashCollectionMapper; @Override public PageInfo select(Integer pageNum, Integer pageSize, CashRecordDTO cashRecordDTO) { @@ -175,10 +177,10 @@ public class CashRefundServiceImpl implements RefundService { cashRecordRefund.setMarket(String.valueOf(Integer.valueOf(marketMapper.getMarketId(cashRecordRefund.getMarket())))); cashRefundMapper.insert(cashRecordRefund); CashRecordDone cashRecordDone1 = new CashRecordDone(); - cashRecordDone1.setId(cashRecordRefund.getId()); + cashRecordDone1.setId(cashRecordRefund.getOriginalOrderId()); cashRecordDone1.setStatus(6); if (cashRecordDone1.getId()!=null||cashRecordDone1.getOrderCode()!= null) - return cashRefundMapper.updateStatus(cashRecordDone1); + cashRefundMapper.updateStatus(cashRecordDone1); else return Result.error("提交失败").getCode(); // 发送退款创建消息 @@ -194,6 +196,7 @@ public class CashRefundServiceImpl implements RefundService { rabbitTemplate.convertAndSend(RabbitMQConfig.CASH_REFUND_EXCHANGE, "cash.refund.save", message); return Result.success("提交成功").getCode(); + } @Override @@ -244,7 +247,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); message.setName(cashRecordDTO.getName()); message.setStatus(cashRecordDTO.getStatus()); message.setDesc(cashRecordDTO.getJwcode()+"用户有条退款订单需审核"); - message.setTitle("现金退款--新增退款"); + message.setTitle("现金退款--当地退款审核"); message.setType(1); message.setTypeId(cashRecordDTO.getId()); message.setMarket(cashRecordDTO.getMarket()); @@ -353,7 +356,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); message.setName(cashRecordDTO.getName()); message.setStatus(cashRecordDTO.getStatus()); message.setDesc(cashRecordDTO.getJwcode()+"用户有条退款订单需审核"); - message.setTitle("现金退款--新增退款"); + message.setTitle("现金退款--执行人退款提交"); message.setType(1); message.setTypeId(cashRecordDTO.getId()); message.setMarket(cashRecordDTO.getMarket());