From 24b53bf61f66428727e1dcbc4abf4320d8f48d8c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 May 2021 17:21:20 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/rabbit/producer/OtcProducter.java | 6 ++----
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 3 ++-
src/main/java/com/xcong/excoin/modules/otc/vo/BuyOrderDetailVo.java | 8 ++++++--
src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java | 1 +
src/main/java/com/xcong/excoin/quartz/job/OtcOrderJob.java | 2 +-
5 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java b/src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java
index 0fddb3f..fc1d2b9 100644
--- a/src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java
+++ b/src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java
@@ -163,6 +163,7 @@
params.put("x-dead-letter-exchange", EXCHANGE_DELAY);
// x-dead-letter-routing-key 声明了这些死信在转发时携带的 routing-key 名称。
params.put("x-dead-letter-routing-key", ROUTING_KEY_DELAY);
+ params.put("x-message-ttl", 6000);
return new Queue(QUEUE_DELAY, true, false, false, params);
}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
index e76d75b..6f4966e 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
@@ -295,6 +295,7 @@
buyDetail.setUnitPrice(buyOrder.getUnitPrice());
buyDetail.setCreateTime(buyOrder.getCreateTime());
buyDetail.setIsMb(member.getIsTrader());
+ buyDetail.setPayName(buyOrder.getPayName());
OtcOrder saleOrder = this.baseMapper.selectOrderByOrderNoAndType(otcOrder.getOrderNo(), OtcEntrustOrder.ORDER_TYPE_S);
MemberEntity saleMember = memberDao.selectById(saleOrder.getMemberId());
@@ -303,7 +304,7 @@
buyDetail.setBankName(buyOrder.getBankName());
buyDetail.setBankNo(buyOrder.getBankNo());
- buyDetail.setPayName(buyOrder.getCardName());
+ buyDetail.setCardName(buyOrder.getCardName());
buyDetail.setPayTime(buyOrder.getPayTime());
if (!buyOrder.getMemberId().equals(buyOrder.getEntrustMemberId())) {
diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/BuyOrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/BuyOrderDetailVo.java
index e68e87c..46b96e6 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/vo/BuyOrderDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/BuyOrderDetailVo.java
@@ -35,13 +35,17 @@
@ApiModelProperty(value = "银行卡号")
private String bankNo;
- @ApiModelProperty(value = "姓名")
- private String payName;
+ @ApiModelProperty(value = "银行卡姓名")
+ private String cardName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "支付时间")
private Date payTime;
+
+ @ApiModelProperty(value = "姓名")
+ private String payName;
+
@ApiModelProperty(value = "商家昵称")
private String saleName;
diff --git a/src/main/java/com/xcong/excoin/quartz/job/OtcOrderJob.java b/src/main/java/com/xcong/excoin/quartz/job/OtcOrderJob.java
index bac8760..bde67f8 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/OtcOrderJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/OtcOrderJob.java
@@ -38,7 +38,7 @@
private MemberWalletCoinDao memberWalletCoinDao;
-// @Scheduled(cron = "0/1 * * * * ? ")
+ @Scheduled(cron = "0/1 * * * * ? ")
public void autoCancelOrder() {
List<OtcOrder> otcOrders = otcOrderDao.selectOrderListWithStatusAndType(OtcEntrustOrder.ORDER_TYPE_B, OtcOrder.STATUS_SUBMIT);
if (CollUtil.isNotEmpty(otcOrders)) {
diff --git a/src/main/java/com/xcong/excoin/rabbit/producer/OtcProducter.java b/src/main/java/com/xcong/excoin/rabbit/producer/OtcProducter.java
index c782cac..829fbeb 100644
--- a/src/main/java/com/xcong/excoin/rabbit/producer/OtcProducter.java
+++ b/src/main/java/com/xcong/excoin/rabbit/producer/OtcProducter.java
@@ -32,10 +32,8 @@
public void sendDelayOrderMsg(String content) {
log.info("-----{}", new Date());
- rabbitTemplate.convertAndSend(RabbitMqConfig.EXCHANGE_DELAY, RabbitMqConfig.ROUTING_KEY_DELAY, content, message -> {
- message.getMessageProperties().setExpiration(1000 * 60 + "");
- return message;
- });
+ CorrelationData correlationData = new CorrelationData(IdUtil.simpleUUID());
+ rabbitTemplate.convertAndSend(RabbitMqConfig.EXCHANGE_DELAY, RabbitMqConfig.ROUTING_KEY_DELAY, content,correlationData );
}
@Override
--
Gitblit v1.9.1