From d30d959c8f249c20b39e66dd0c48341a77751d21 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 May 2021 17:03:32 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/rabbit/producer/OtcProducter.java | 2 +-
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java | 2 +-
src/main/resources/mapper/otc/OtcOrderDao.xml | 2 +-
src/test/java/com/xcong/excoin/OtcTest.java | 13 ++++++++++++-
src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java | 1 +
src/main/java/com/xcong/excoin/quartz/job/OtcOrderJob.java | 2 +-
src/main/java/com/xcong/excoin/rabbit/consumer/OtcConsumer.java | 6 +++---
7 files changed, 20 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 d70b3a9..0fddb3f 100644
--- a/src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java
+++ b/src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java
@@ -151,6 +151,7 @@
return new DirectExchange(EXCHANGE_ONE);
}
+ @Bean
public DirectExchange delayExchange() {
return new DirectExchange(EXCHANGE_DELAY);
}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
index 6f3722c..770eb57 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
@@ -72,7 +72,7 @@
throw new GlobalException("可用金额不足");
}
- memberWalletCoinDao.updateFrozenBalance(member.getId(), coinWallet.getId(), totalAmount);
+ memberWalletCoinDao.updateFrozenBalance(member.getId(), coinWallet.getId(), addDto.getAmount());
}
OtcMarketBussiness mb = otcMarketBussinessDao.selectMarketBussinessByMemberId(member.getId());
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 bde67f8..bac8760 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/consumer/OtcConsumer.java b/src/main/java/com/xcong/excoin/rabbit/consumer/OtcConsumer.java
index 8d8a336..e26554d 100644
--- a/src/main/java/com/xcong/excoin/rabbit/consumer/OtcConsumer.java
+++ b/src/main/java/com/xcong/excoin/rabbit/consumer/OtcConsumer.java
@@ -20,8 +20,8 @@
}
-// @RabbitListener(queues = RabbitMqConfig.QUEUE_DELAY)
- public void delayOrder() {
- log.info("---->{}", new Date());
+ @RabbitListener(queues = RabbitMqConfig.QUEUE_DELAY)
+ public void delayOrder(String content) {
+ log.info("--{}-->{}", new Date(), content);
}
}
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 1b50266..c782cac 100644
--- a/src/main/java/com/xcong/excoin/rabbit/producer/OtcProducter.java
+++ b/src/main/java/com/xcong/excoin/rabbit/producer/OtcProducter.java
@@ -33,7 +33,7 @@
public void sendDelayOrderMsg(String content) {
log.info("-----{}", new Date());
rabbitTemplate.convertAndSend(RabbitMqConfig.EXCHANGE_DELAY, RabbitMqConfig.ROUTING_KEY_DELAY, content, message -> {
- message.getMessageProperties().setExpiration(60 + "");
+ message.getMessageProperties().setExpiration(1000 * 60 + "");
return message;
});
}
diff --git a/src/main/resources/mapper/otc/OtcOrderDao.xml b/src/main/resources/mapper/otc/OtcOrderDao.xml
index 154def2..245633e 100644
--- a/src/main/resources/mapper/otc/OtcOrderDao.xml
+++ b/src/main/resources/mapper/otc/OtcOrderDao.xml
@@ -81,7 +81,7 @@
<select id="selectMemberAvgCoinTime" resultType="java.math.BigDecimal">
select
- IFNULL(sum(timestampdiff(SECOND, pay_time, coin_time))/count(1), 0)
+ IFNULL(sum(timestampdiff(SECOND, pay_time, finish_time))/count(1), 0)
from otc_order
where status=3 and member_id=40 and order_type='S'
</select>
diff --git a/src/test/java/com/xcong/excoin/OtcTest.java b/src/test/java/com/xcong/excoin/OtcTest.java
index ea66dc0..3fb1d06 100644
--- a/src/test/java/com/xcong/excoin/OtcTest.java
+++ b/src/test/java/com/xcong/excoin/OtcTest.java
@@ -6,6 +6,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+import java.util.concurrent.TimeUnit;
+
@Slf4j
@SpringBootTest
public class OtcTest {
@@ -15,6 +17,15 @@
@Test
public void rabbitTest() {
- otcProducter.sendMarketBussinessMsg("123456");
+ otcProducter.sendDelayOrderMsg("123456");
+
+ while(true){
+ try {
+ TimeUnit.SECONDS.sleep(1);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
+ }
}
}
--
Gitblit v1.9.1