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); } src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
@@ -937,10 +937,10 @@ QueryWrapper<FollowFollowerSettingEntity> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("member_id",coinsOrder.getMemberId()); FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectOne(queryWrapper); if(ObjectUtil.isNotEmpty(followFollowerSettingEntity)){ Long traderMemberId = followFollowerSettingEntity.getTraderMemberId(); followFollowerProfitDao.updateFollowerProfitByTradeMemberId(coinsOrder.getBondAmount().negate(), coinsOrder.getBondAmount().negate(), traderMemberId, memberEntity.getId()); } // if(ObjectUtil.isNotEmpty(followFollowerSettingEntity)){ // Long traderMemberId = followFollowerSettingEntity.getTraderMemberId(); // followFollowerProfitDao.updateFollowerProfitByTradeMemberId(coinsOrder.getBondAmount().negate(), coinsOrder.getBondAmount().negate(), traderMemberId, memberEntity.getId()); // } FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(followFollowerSettingEntity.getTraderId()); //更新跟随者-订单关联表 updateFollowOrderRelation(coinsOrder.getId(), contractOrderEntity.getId()); src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
@@ -226,7 +226,7 @@ if (MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) { followOrderOperationService.closingFollowOrders(holdOrderEntity.getOrderNo()); } else { followFollowerProfitDao.updateFollowerProfitByTradeMemberId(holdOrderEntity.getBondAmount(), profitOrLoss, traderInfoEntity.getMemberId(), memberEntity.getId()); //followFollowerProfitDao.updateFollowerProfitByTradeMemberId(holdOrderEntity.getBondAmount(), profitOrLoss, traderInfoEntity.getMemberId(), memberEntity.getId()); LogRecordUtils.insertFollowerNotice(memberEntity.getId(), NoticeConstant.CLOSE_ORDER_TITLE, StrUtil.format(NoticeConstant.CLOSE_ORDER_CONTENT, contractOrderEntity.getSymbol(), contractOrderEntity.getClosingPrice().setScale(2, BigDecimal.ROUND_HALF_UP).toString(), profitOrLoss.setScale(2, BigDecimal.ROUND_HALF_UP).toString(), traderInfoEntity.getNickname())); } } src/main/java/com/xcong/excoin/modules/documentary/dao/FollowFollowerProfitDao.java
@@ -44,5 +44,9 @@ BigDecimal selectAllFollowerProfit(@Param("tradeMemberId") Long tradeMemberId); List<FollowFollowerProfitEntity> selectByMemberIdandIsFollow(@Param("id") Long id, @Param("isFollowY") Integer isFollowY); BigDecimal selectSumBondAmountBymemberId(@Param("memberId")Long memberId,@Param("tradeId") Long tradeId); BigDecimal selectSumRewardAmountByMemberId(@Param("memberId")Long memberId,@Param("tradeId") Long tradeId); } src/main/java/com/xcong/excoin/quartz/job/FollowProfitUpdateJob.java
@@ -7,6 +7,7 @@ import com.xcong.excoin.modules.documentary.dao.FollowFollowerProfitDao; import com.xcong.excoin.modules.documentary.dao.FollowTraderInfoDao; import com.xcong.excoin.modules.documentary.dao.FollowTraderProfitInfoDao; import com.xcong.excoin.modules.documentary.entity.FollowFollowerProfitEntity; import com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity; import com.xcong.excoin.modules.documentary.entity.FollowTraderProfitInfoEntity; import lombok.extern.slf4j.Slf4j; @@ -17,7 +18,9 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; /** * @@ -51,6 +54,27 @@ if (CollUtil.isNotEmpty(allTraders)) { for (FollowTraderInfoEntity trader : allTraders) { Long tradeMemberId = trader.getMemberId(); //获取交易员的当前跟随者 Map<String, Object> hashMap = new HashMap<>(); hashMap.put("trade_member_id", tradeMemberId); hashMap.put("is_follow", FollowFollowerProfitEntity.IS_FOLLOW_Y); List<FollowFollowerProfitEntity> followFollowerProfitEntityList = followFollowerProfitDao.selectByMap(hashMap); if(CollUtil.isNotEmpty(followFollowerProfitEntityList)) { for(FollowFollowerProfitEntity followFollowerProfitEntity : followFollowerProfitEntityList) { //获取当前跟随者的跟随本金 Long memberId = followFollowerProfitEntity.getMemberId(); BigDecimal sumBondAmountBigDecimal = followFollowerProfitDao.selectSumBondAmountBymemberId(memberId,trader.getId()); sumBondAmountBigDecimal = (sumBondAmountBigDecimal == null?BigDecimal.ZERO:sumBondAmountBigDecimal.setScale(2, BigDecimal.ROUND_DOWN)); followFollowerProfitEntity.setTotalPrincipal(sumBondAmountBigDecimal); //获取当前的盈亏 BigDecimal sumRewardAmountBigDecimal = followFollowerProfitDao.selectSumRewardAmountByMemberId(memberId,trader.getId()); sumRewardAmountBigDecimal = (sumRewardAmountBigDecimal == null?BigDecimal.ZERO:sumRewardAmountBigDecimal.setScale(2, BigDecimal.ROUND_DOWN)); followFollowerProfitEntity.setTotalProfit(sumRewardAmountBigDecimal); followFollowerProfitDao.updateById(followFollowerProfitEntity); } } FollowTraderProfitInfoEntity traderInfoProfit = followTraderProfitInfoDao.selectTraderInfoProfitByMemberId(tradeMemberId); // 累计收益率 BigDecimal ljsyl = contractOrderDao.selectFollowOrderTotalProfitByMemberId(tradeMemberId); @@ -61,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); 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 src/main/resources/mapper/documentary/FollowFollowerProfitDao.xml
@@ -1,7 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.xcong.excoin.modules.documentary.dao.FollowFollowerProfitDao"> <select id="selectSumRewardAmountByMemberId" resultType="java.math.BigDecimal"> SELECT SUM(a.reward_amount) FROM contract_order a LEFT JOIN follow_follower_order_relation b ON a.id = b.order_id WHERE a.member_id = #{memberId} AND b.order_type = 2 and b.trade_id = #{tradeId}; </select> <select id="selectSumBondAmountBymemberId" resultType="java.math.BigDecimal"> SELECT SUM(a.bond_amount) FROM contract_order a LEFT JOIN follow_follower_order_relation b ON a.id = b.order_id WHERE a.member_id = #{memberId} AND b.order_type = 2 and b.trade_id = #{tradeId}; </select> <select id="selectByMemberIdandIsFollow" resultType="com.xcong.excoin.modules.documentary.entity.FollowFollowerProfitEntity"> SELECT *
