20200730 代码提交

xiaoyong931011

2020-07-30 0c89a2588a6b69465e3c065ddea0a02d7c6535f0

20200730 代码提交

 src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java

@@ -25,6 +25,7 @@
import com.xcong.excoin.modules.documentary.vo.FollowInfoVo;

import com.xcong.excoin.modules.documentary.vo.FollowRecordsVo;

import com.xcong.excoin.modules.documentary.vo.FollowTraderProfitInfoVo;

import com.xcong.excoin.modules.documentary.vo.HistoryOrderRecordsVo;

import com.xcong.excoin.modules.documentary.vo.MemberIsTradeVo;

import com.xcong.excoin.modules.documentary.vo.MyFollowOrderVo;

import com.xcong.excoin.modules.documentary.vo.MyFollowTraderInfoVo;

@@ -69,7 +70,7 @@
     * @return

     */

    @ApiOperation(value="历史带单", notes="历史带单")

    @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAgentIntoInfoVo.class)})

    @ApiResponses({@ApiResponse( code = 200, message = "success", response = HistoryOrderRecordsVo.class)})

    @PostMapping(value = "/getHistoryOrderRecords")

    public Result  getHistoryOrderRecords(@RequestBody @Valid HistoryOrderRecordsDto historyOrderRecordsDto) {

        return documentaryService.getHistoryOrderRecords(historyOrderRecordsDto);


 src/main/java/com/xcong/excoin/modules/documentary/dto/HistoryOrderRecordsDto.java

@@ -21,7 +21,7 @@
    private int pageSize;

    

    @NotNull

    @ApiModelProperty(value = "会员ID", example = "12543")

    private Long memberId;

    @ApiModelProperty(value = "交易员ID", example = "12543")

    private Long tradeId;



}


 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java

@@ -62,6 +62,7 @@
import com.xcong.excoin.utils.RedisUtils;



import cn.hutool.core.collection.CollUtil;

import cn.hutool.core.util.ObjectUtil;

import cn.hutool.core.util.StrUtil;

import lombok.extern.slf4j.Slf4j;



@@ -121,6 +122,19 @@
        List<FollowTraderProfitInfoVo> followTraderProfitInfoVoList = followTraderProfitInfoList.getRecords();

        if(CollUtil.isNotEmpty(followTraderProfitInfoVoList)) {

            for(FollowTraderProfitInfoVo FollowTraderProfitInfoVo : followTraderProfitInfoVoList) {

                MemberEntity user = LoginUserUtils.getUser();

                if(ObjectUtil.isNotEmpty(user)) {

                    Long traderId = FollowTraderProfitInfoVo.getTraderId();

                    Long memberId = user.getId();

                    FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectDocumentaryOrderSetInfoBymemberIdAndTradeId(memberId, traderId);

                    if(ObjectUtil.isNotEmpty(followFollowerProfitEntity)) {

                        FollowTraderProfitInfoVo.setDocumentaaryType(1);

                    }else {

                        FollowTraderProfitInfoVo.setDocumentaaryType(2);

                    }

                }else {

                    FollowTraderProfitInfoVo.setDocumentaaryType(2);

                }

                Long traderId = FollowTraderProfitInfoVo.getTraderId();

                FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectFollowTraderInfoEntityBytreaderId(traderId);

                String avatar = followTraderInfoEntity.getAvatar();

@@ -131,8 +145,6 @@
                FollowTraderProfitInfoVo.setDeclaration(declaration);

                Integer isAll = followTraderInfoEntity.getIsAll();

                FollowTraderProfitInfoVo.setIsAll(isAll);

                Integer isOpen = followTraderInfoEntity.getIsOpen();

                FollowTraderProfitInfoVo.setIsOpen(isOpen);

            }

        }

        return Result.ok(followTraderProfitInfoVoList);

@@ -141,8 +153,11 @@
    @Override

    public Result getHistoryOrderRecords(@Valid HistoryOrderRecordsDto historyOrderRecordsDto) {

        

        FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(historyOrderRecordsDto.getTradeId());

        Long memberId = followTraderInfoEntity.getMemberId();

		
        Page<HistoryOrderRecordsVo> page = new Page<>(historyOrderRecordsDto.getPageNum(), historyOrderRecordsDto.getPageSize());

        IPage<HistoryOrderRecordsVo> historyOrderRecordsVoList = followTraderProfitInfoDao.selectHistoryOrderRecords(page, historyOrderRecordsDto.getMemberId());

        IPage<HistoryOrderRecordsVo> historyOrderRecordsVoList = followTraderProfitInfoDao.selectHistoryOrderRecords(page, memberId);

        return Result.ok(historyOrderRecordsVoList);

    }




 src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java

@@ -78,9 +78,9 @@
    @ApiModelProperty("是否满员 1-是2-否")

    private Integer isAll;

    /**

     * 是否开启带单 1是2否

     * 跟单状态 1：已跟单2：未跟单

     */

    @ApiModelProperty("是否开启带单 1是2否")

    private Integer isOpen;

    @ApiModelProperty("跟单状态 1：已跟单2：未跟单")

    private Integer documentaaryType;



}