From 05666deefd5981084f9a0baddc91e7cf00bc24cc Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 30 Mar 2021 12:49:26 +0800
Subject: [PATCH] 20210329  交易笔数

---
 src/main/resources/mapper/contract/ContractOrderDao.xml                   |   10 ++++++++++
 src/main/java/com/xcong/excoin/modules/contract/dao/ContractOrderDao.java |    2 ++
 src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java      |    3 ++-
 3 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/dao/ContractOrderDao.java b/src/main/java/com/xcong/excoin/modules/contract/dao/ContractOrderDao.java
index 1ef44c6..ec49b0e 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/dao/ContractOrderDao.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/dao/ContractOrderDao.java
@@ -33,4 +33,6 @@
     int updateOrderProfitOrLessById(@Param("rewardAmount") BigDecimal rewardAmount, @Param("rewardRatio") BigDecimal rewardRatio, @Param("id") Long id);
 
 	public BigDecimal getBurstUsdtByMemberId(@Param("memberId") Long memberId);
+
+	public List<ContractOrderEntity> selectFollowOrderListByMemberId(@Param("tradeMemberId")Long tradeMemberId);
 }
diff --git a/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java b/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
index 91dce9e..aa2e1cb 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
@@ -85,7 +85,8 @@
                 //BigDecimal totalProfit = followFollowerOrderRelationDao.selectTraderTotalProfit(tradeMemberId);
                 traderInfoProfit.setTotalProfit(totalProfit);
                 // 交易笔数
-                List<ContractOrderEntity> orders = contractOrderDao.selectFollowOrderByMemberId(tradeMemberId);
+//                List<ContractOrderEntity> orders = contractOrderDao.selectFollowOrderByMemberId(tradeMemberId);
+                List<ContractOrderEntity> orders = contractOrderDao.selectFollowOrderListByMemberId(tradeMemberId);
                 traderInfoProfit.setTotalOrderCnt(CollUtil.isNotEmpty(orders) ? orders.size() : 0);
                 // 近三周胜率
                 Integer winCnt = contractOrderDao.selectFollowOrderCntForWinRate(tradeMemberId, 1);
diff --git a/src/main/resources/mapper/contract/ContractOrderDao.xml b/src/main/resources/mapper/contract/ContractOrderDao.xml
index ff042eb..fe6ad61 100644
--- a/src/main/resources/mapper/contract/ContractOrderDao.xml
+++ b/src/main/resources/mapper/contract/ContractOrderDao.xml
@@ -2,6 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xcong.excoin.modules.contract.dao.ContractOrderDao">
 
+    <select id="selectFollowOrderListByMemberId" resultType="com.xcong.excoin.modules.contract.entity.ContractOrderEntity">
+        SELECT
+            *
+        FROM
+            contract_order
+        WHERE
+            member_id = #{tradeMemberId}
+          AND contract_type = 2
+          AND closing_price IS NOT NULL;
+    </select>
 
     <select id="selectContractOrderInPage" resultType="com.xcong.excoin.modules.contract.entity.ContractOrderEntity">
         select

--
Gitblit v1.9.1