From 4bfb58a3ee4a2c8be9588298c038efda3f5fe85e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Mar 2021 16:11:06 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity
---
src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java | 1 +
src/main/resources/mapper/documentary/FollowTraderInfoDao.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
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 e14edcc..a9b5f51 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
@@ -41,6 +41,7 @@
@Resource
private FollowTraderProfitInfoDao followTraderProfitInfoDao;
+
//@Scheduled(cron = "0 0/30 * * * ? ")
@Scheduled(cron = "0/5 * * * * ?")
public void traderProfitUpdate() {
diff --git a/src/main/resources/mapper/documentary/FollowTraderInfoDao.xml b/src/main/resources/mapper/documentary/FollowTraderInfoDao.xml
index d518a77..f4675fb 100644
--- a/src/main/resources/mapper/documentary/FollowTraderInfoDao.xml
+++ b/src/main/resources/mapper/documentary/FollowTraderInfoDao.xml
@@ -15,7 +15,7 @@
<select id="selectTraderInfoByOrderId" resultType="com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity">
select a.*
from follow_trader_info a, follow_follower_order_relation b
- where a.member_id=b.trade_member_id and b.order_id=#{orderId}
+ where a.member_id=b.trade_member_id and b.order_id=#{orderId} and b.order_type=1
</select>
<select id="selectAllTraderInfo" resultType="com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity">
--
Gitblit v1.9.1