From 30c1c9d16a57d2bbc7cd1511d02c5ddcc6a143f6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 08 Jun 2021 16:10:44 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/quartz/job/OtcOrderJob.java |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

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 4e336b7..669e0d4 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/OtcOrderJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/OtcOrderJob.java
@@ -88,20 +88,29 @@
         }
     }
 
-    @Scheduled(cron = "0 0/5 * * * ? ")
+//    @Scheduled(cron = "0 0/5 * * * ? ")
     public void marketBussinessJob() {
         List<OtcMarketBussiness> list = otcMarketBussinessDao.selectList(null);
         if (CollUtil.isNotEmpty(list)) {
             for (OtcMarketBussiness mb : list) {
                 // 服务人数
                 Integer buyCnt = otcOrderDao.selectMemberCntForEntrust(mb.getMemberId());
-                // 总单数
-                Integer totalCnt = otcOrderDao.selectTotalOrderCount(mb.getMemberId(), null);
-                // 完成率
-                Integer finishCnt = otcOrderDao.selectTotalOrderCount(mb.getMemberId(), OtcOrder.STATUS_FINISH);
-                if (totalCnt != null && totalCnt != 0) {
-                    BigDecimal finishRatio = BigDecimal.valueOf(finishCnt).divide(BigDecimal.valueOf(totalCnt), 4, BigDecimal.ROUND_DOWN);
+                // 买单数
+                Integer buyTotalCnt = otcOrderDao.selectTotalOrderCount(mb.getMemberId(), null, OtcEntrustOrder.ORDER_TYPE_B);
+                // 买单完成率
+                Integer buyFinishCnt = otcOrderDao.selectTotalOrderCount(mb.getMemberId(), OtcOrder.STATUS_FINISH, OtcEntrustOrder.ORDER_TYPE_B);
+                if (buyTotalCnt != null && buyTotalCnt != 0) {
+                    BigDecimal finishRatio = BigDecimal.valueOf(buyFinishCnt).divide(BigDecimal.valueOf(buyTotalCnt), 4, BigDecimal.ROUND_DOWN);
                     mb.setFinishRatio(finishRatio);
+                }
+
+                // 买单数
+                Integer saleTotalCnt = otcOrderDao.selectTotalOrderCount(mb.getMemberId(), null, OtcEntrustOrder.ORDER_TYPE_S);
+                // 买单完成率
+                Integer saleFinishCnt = otcOrderDao.selectTotalOrderCount(mb.getMemberId(), OtcOrder.STATUS_FINISH, OtcEntrustOrder.ORDER_TYPE_S);
+                if (saleTotalCnt != null && saleTotalCnt != 0) {
+                    BigDecimal finishRatio = BigDecimal.valueOf(saleFinishCnt).divide(BigDecimal.valueOf(saleTotalCnt), 4, BigDecimal.ROUND_DOWN);
+                    mb.setSaleFinishRatio(finishRatio);
                 }
                 // 平均付款时间
                 BigDecimal avgPayTime = otcOrderDao.selectMemberAvgPayTime(mb.getMemberId());
@@ -109,7 +118,8 @@
                 BigDecimal avgCoinTime = otcOrderDao.selectMemberAvgCoinTime(mb.getMemberId());
 
                 mb.setBuyCnt(buyCnt);
-                mb.setTotalOrderCnt(totalCnt);
+                mb.setTotalOrderCnt(buyTotalCnt);
+                mb.setSaleOrderCnt(saleTotalCnt);
                 mb.setAvgPayTime(avgPayTime.intValue());
                 mb.setAvgCoinTime(avgCoinTime.intValue());
 

--
Gitblit v1.9.1