From 1185fe008ccf76d26272df82146d0ac1d750cb4c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 04 Jun 2021 11:42:50 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/rabbit/consumer/OtcConsumer.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
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 c794c2c..a99af18 100644
--- a/src/main/java/com/xcong/excoin/rabbit/consumer/OtcConsumer.java
+++ b/src/main/java/com/xcong/excoin/rabbit/consumer/OtcConsumer.java
@@ -4,6 +4,7 @@
import com.xcong.excoin.configurations.RabbitMqConfig;
import com.xcong.excoin.modules.otc.dao.OtcEntrustOrderDao;
import com.xcong.excoin.modules.otc.dao.OtcMarketBussinessDao;
+import com.xcong.excoin.modules.otc.dao.OtcOrderDao;
import com.xcong.excoin.modules.otc.entity.OtcEntrustOrder;
import com.xcong.excoin.modules.otc.entity.OtcMarketBussiness;
import com.xcong.excoin.modules.otc.entity.OtcOrder;
@@ -28,29 +29,54 @@
@Autowired
private OtcEntrustOrderDao otcEntrustOrderDao;
+ @Autowired
+ private OtcOrderDao otcOrderDao;
+
@RabbitListener(queues = RabbitMqConfig.QUEUE_MARKET_BUSSINESS)
public void marketBussiness(String content) {
log.info("收到市商消息:{}", content);
JSONObject jsonObject = JSONObject.parseObject(content);
- Long entrustOrderId = (Long) jsonObject.get("entrustOrderId");
+ Integer entrustOrderIdInt = jsonObject.getInteger("entrustOrderId");
+ Long entrustOrderId = entrustOrderIdInt.longValue();
Integer status = jsonObject.getInteger("status");
OtcEntrustOrder entrustOrder = otcEntrustOrderDao.selectById(entrustOrderId);
OtcMarketBussiness mb = otcMarketBussinessDao.selectMarketBussinessByMemberId(entrustOrder.getMemberId());
- mb.setTotalOrderCnt(mb.getTotalOrderCnt() + 1);
if (!OtcOrder.STATUS_CANCEL.equals(status)) {
if (OtcEntrustOrder.ORDER_TYPE_S.equals(entrustOrder.getOrderType())) {
mb.setSaleOrderCnt(mb.getSaleOrderCnt() + 1);
+ mb.setSaleTotalCnt(mb.getSaleTotalCnt() + 1);
} else {
mb.setBuyOrderCnt(mb.getBuyOrderCnt() + 1);
+ mb.setTotalOrderCnt(mb.getTotalOrderCnt() + 1);
+ }
+ } else {
+ if (OtcEntrustOrder.ORDER_TYPE_S.equals(entrustOrder.getOrderType())) {
+ mb.setSaleTotalCnt(mb.getSaleTotalCnt() + 1);
+ } else {
+ mb.setTotalOrderCnt(mb.getTotalOrderCnt() + 1);
}
}
- BigDecimal buyFinishRatio = BigDecimal.valueOf(mb.getBuyOrderCnt()).divide(BigDecimal.valueOf(mb.getTotalOrderCnt()), 8, BigDecimal.ROUND_DOWN);
- BigDecimal saleFinishRatio = BigDecimal.valueOf(mb.getSaleOrderCnt()).divide(BigDecimal.valueOf(mb.getTotalOrderCnt()), 8, BigDecimal.ROUND_DOWN);
- mb.setFinishRatio(buyFinishRatio);
- mb.setSaleFinishRatio(saleFinishRatio);
+ if (mb.getTotalOrderCnt() != 0) {
+ BigDecimal buyFinishRatio = BigDecimal.valueOf(mb.getBuyOrderCnt()).divide(BigDecimal.valueOf(mb.getTotalOrderCnt()), 8, BigDecimal.ROUND_DOWN);
+ mb.setFinishRatio(buyFinishRatio);
+ }
+
+ if (mb.getSaleTotalCnt() != 0) {
+ BigDecimal saleFinishRatio = BigDecimal.valueOf(mb.getSaleOrderCnt()).divide(BigDecimal.valueOf(mb.getSaleTotalCnt()), 8, BigDecimal.ROUND_DOWN);
+ mb.setSaleFinishRatio(saleFinishRatio);
+ }
+
+
+ // 平均付款时间
+// BigDecimal avgPayTime = otcOrderDao.selectMemberAvgPayTime(mb.getMemberId());
+// // 平均放币时间
+// BigDecimal avgCoinTime = otcOrderDao.selectMemberAvgCoinTime(mb.getMemberId());
+//
+// mb.setAvgPayTime(avgPayTime.intValue());
+// mb.setAvgCoinTime(avgCoinTime.intValue());
otcMarketBussinessDao.updateById(mb);
}
--
Gitblit v1.9.1