Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

xiaoyong931011

2021-03-26 4bfb58a3ee4a2c8be9588298c038efda3f5fe85e

Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

 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() {

 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">