From 1bef08bd6323d6250eb365380425819aab798ec2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 May 2021 10:44:01 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/rabbit/producer/OtcProducter.java                 |   35 +++++++++++++++++
 src/main/java/com/xcong/excoin/modules/otc/entity/OtcMarketBussiness.java        |   10 +++++
 src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java |    5 ++
 src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java                |   14 +++++++
 src/main/java/com/xcong/excoin/rabbit/consumer/OtcConsumer.java                  |   17 ++++++++
 5 files changed, 81 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java b/src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java
index 216bcca..e19007f 100644
--- a/src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java
+++ b/src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java
@@ -118,6 +118,10 @@
     // 全仓价格操作
     public static final String ROUTINGKEY_WHOLE_PRICE = "ROUTINGKEY_WHOLE_PRICE";
 
+    public static final String ROUTINGKEY_MARKET_BUSSINESS = "ROUTINGKEY_MARKET_BUSSINESS";
+
+    public static final String QUEUE_MARKET_BUSSINESS = "QUEUE_MARKET_BUSSINESS";
+
     @Resource
     private ConnectionFactory connectionFactory;
 
@@ -142,6 +146,16 @@
     }
 
     @Bean
+    public Queue marketBussinessQueue() {
+        return new Queue(QUEUE_MARKET_BUSSINESS);
+    }
+
+    @Bean
+    public Binding marketBussinessBinding() {
+        return BindingBuilder.bind(marketBussinessQueue()).to(defaultExchange()).with(ROUTINGKEY_MARKET_BUSSINESS);
+    }
+
+    @Bean
     public Queue testQueue() {
         return new Queue(QUEUE_TEST, true);
     }
diff --git a/src/main/java/com/xcong/excoin/modules/otc/entity/OtcMarketBussiness.java b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcMarketBussiness.java
index 26f627a..e77e324 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/entity/OtcMarketBussiness.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcMarketBussiness.java
@@ -33,4 +33,14 @@
     private Integer avgPayTime;
 
     private Integer avgCoinTime;
+
+    /**
+     * 待回款
+     */
+    private BigDecimal waitBackMoney;
+
+    /**
+     * 已回款
+     */
+    private BigDecimal hasBackMoney;
 }
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 fe46ce8..41b7061 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
@@ -331,6 +331,11 @@
             saleDetail.setOrderCnt(otcMb.getBuyCnt());
         }
 
+        if (OtcOrder.STATUS_SUBMIT.equals(saleOrder.getStatus())) {
+            long between = DateUtil.between(new Date(), DateUtil.offsetMinute(saleOrder.getCreateTime(), 30), DateUnit.SECOND, false);
+            saleDetail.setTimes(between);
+        }
+
         return Result.ok(saleDetail);
     }
 
diff --git a/src/main/java/com/xcong/excoin/rabbit/consumer/OtcConsumer.java b/src/main/java/com/xcong/excoin/rabbit/consumer/OtcConsumer.java
new file mode 100644
index 0000000..2d43b3e
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/rabbit/consumer/OtcConsumer.java
@@ -0,0 +1,17 @@
+package com.xcong.excoin.rabbit.consumer;
+
+import com.xcong.excoin.configurations.RabbitMqConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class OtcConsumer {
+
+
+    @RabbitListener(queues = RabbitMqConfig.QUEUE_MARKET_BUSSINESS)
+    public void marketBussiness(String content) {
+        log.info("---->{}", 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
new file mode 100644
index 0000000..cdee752
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/rabbit/producer/OtcProducter.java
@@ -0,0 +1,35 @@
+package com.xcong.excoin.rabbit.producer;
+
+
+import cn.hutool.core.util.IdUtil;
+import com.xcong.excoin.configurations.RabbitMqConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.connection.CorrelationData;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class OtcProducter implements RabbitTemplate.ConfirmCallback {
+
+    @Autowired
+    private RabbitTemplate rabbitTemplate;
+
+    @Autowired
+    public OtcProducter(RabbitTemplate rabbitTemplate) {
+        this.rabbitTemplate = rabbitTemplate;
+        rabbitTemplate.setConfirmCallback(this);
+    }
+
+    public void sendMarketBussinessMsg(String content) {
+        log.info("发送市商消息");
+        CorrelationData correlationData = new CorrelationData(IdUtil.simpleUUID());
+        rabbitTemplate.convertAndSend(RabbitMqConfig.EXCHANGE_ONE, RabbitMqConfig.ROUTINGKEY_MARKET_BUSSINESS, content, correlationData);
+    }
+
+    @Override
+    public void confirm(CorrelationData correlationData, boolean b, String s) {
+
+    }
+}

--
Gitblit v1.9.1