xiaoyong931011
2021-07-05 cf200a1f92c01ba22c326c49391f748ffb006910
src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
@@ -93,17 +93,21 @@
            }
            //如果是跟单合约,显示他的交易员的邀请码
            int contractType = holdOrderEntity.getContractType();
            if(ContractHoldOrderEntity.CONTRACTTYPE_FOLLOW == contractType) {
               //获取对应的【follow_follower_profit】跟随者收益关系表
               QueryWrapper<FollowFollowerProfitEntity> queryWrapper = new QueryWrapper<>();
               queryWrapper.eq("member_id",holdOrderEntity.getMemberId());
               FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitMapper.selectOne(queryWrapper);
               Long tradeMemberId = followFollowerProfitEntity.getTradeMemberId();
               MemberEntity selectByIdTrader = memberMapper.selectById(tradeMemberId);
               String inviteId = selectByIdTrader.getInviteId();
               holdOrderEntity.setInviteIdTrader(inviteId);
            Long holdOrderEntityMemberId = holdOrderEntity.getMemberId();
            MemberEntity holdOrderEntityMember = memberMapper.selectById(holdOrderEntityMemberId);
            Integer isTrader = holdOrderEntityMember.getIsTrader();
            if(MemberEntity.ISTRADER_N == isTrader) {
               if(ContractHoldOrderEntity.CONTRACTTYPE_FOLLOW == contractType) {
                  //获取对应的【follow_follower_profit】跟随者收益关系表
                  QueryWrapper<FollowFollowerProfitEntity> queryWrapper = new QueryWrapper<>();
                  queryWrapper.eq("member_id",holdOrderEntity.getMemberId());
                  FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitMapper.selectOne(queryWrapper);
                  Long tradeMemberId = followFollowerProfitEntity.getTradeMemberId();
                  MemberEntity selectByIdTrader = memberMapper.selectById(tradeMemberId);
                  String inviteId = selectByIdTrader.getInviteId();
                  holdOrderEntity.setInviteIdTrader(inviteId);
               }
            }
                // 获取最新价
                BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol())));
                BigDecimal lotNumber = holdOrderEntity.getSymbolSku();
@@ -1236,19 +1240,19 @@
            positionSettingVo.setSumRewardAmount(sumRewardAmount);
         }
         //降序
         Collections.sort(records, new Comparator<PositionSettingVo>() {//调用sort()方法,并实现Comparator接口中的compare()方法
            @Override
            public int compare(PositionSettingVo lhs, PositionSettingVo rhs) {
               int value = Integer.valueOf(rhs.getSumRewardAmount().intValue())
                           - Integer.valueOf(lhs.getSumRewardAmount().intValue());
               return value;
            }
         });
//         Collections.sort(records, new Comparator<PositionSettingVo>() {//调用sort()方法,并实现Comparator接口中的compare()方法
//            @Override
//            public int compare(PositionSettingVo lhs, PositionSettingVo rhs) {
//               int value = Integer.valueOf(rhs.getSumRewardAmount().intValue())
//                           - Integer.valueOf(lhs.getSumRewardAmount().intValue());
//               return value;
//            }
//         });
         //升序
         //CollUtil.sortByProperty(records, "sumRewardAmount");
         CollUtil.sortByProperty(records, "sumRewardAmount");
         //CollUtil.sortByProperty(records, "accountType");
      }
      positionSettingVoIPage.setRecords(records);
//      positionSettingVoIPage.setRecords(records);
      return positionSettingVoIPage;
   }