20200731 代码提交

xiaoyong931011

2020-07-31 291cb342a5ffab8d75052d2fe682e81764772614

20200731 代码提交

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

@@ -31,6 +31,8 @@
import com.xcong.excoin.modules.documentary.vo.MyFollowTraderInfoVo;



import io.swagger.annotations.Api;

import io.swagger.annotations.ApiImplicitParam;

import io.swagger.annotations.ApiImplicitParams;

import io.swagger.annotations.ApiOperation;

import io.swagger.annotations.ApiParam;

import io.swagger.annotations.ApiResponse;

@@ -164,9 +166,12 @@
     */

    @ApiOperation(value="跟单---跟单设置--进入编辑", notes="跟单---跟单设置--进入编辑")

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

    @ApiImplicitParams({

        @ApiImplicitParam(name = "tradeId", value = "交易员ID", required = true, dataType = "String", paramType="query")

    })

    @GetMapping(value = "/getDocumentaryOrderSetInfo")

    public Result  getDocumentaryOrderSetInfo() {

        return documentaryService.getDocumentaryOrderSetInfo();

    public Result  getDocumentaryOrderSetInfo(String tradeId) {

        return documentaryService.getDocumentaryOrderSetInfo(tradeId);

    }

    

    /**


 src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java

@@ -36,7 +36,7 @@


    public Result getDocumentaryOrderSet(@Valid DocumentaryOrderSetDto documentaryOrderSetDto);



    public Result getDocumentaryOrderSetInfo();

    public Result getDocumentaryOrderSetInfo(String tradeId);



    public Result cancelDocumentaryOrderSetInfo(@Valid CancelDocumentaryOrderSetDto cancelDocumentaryOrderSetDto);




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

@@ -469,14 +469,14 @@
    }



    @Override

    public Result getDocumentaryOrderSetInfo() {

    public Result getDocumentaryOrderSetInfo(String tradeId) {

        //获取用户ID

        Long memberId = LoginUserUtils.getAppLoginUser().getId();

        DocumentaryOrderSetInfoVo documentaryOrderSetInfoVo = new DocumentaryOrderSetInfoVo();

        long parseLong = Long.parseLong(tradeId);

        //获取【跟随者设置】数据

        FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectDocumentaryOrderSetInfoBymemberId(memberId);

        Long tradeId = followFollowerSettingEntity.getTradeId();

        documentaryOrderSetInfoVo.setTraderId(tradeId);

        FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectOneBymemberIdAndTradeId(memberId,parseLong);

        documentaryOrderSetInfoVo.setTraderId(parseLong);

        

        FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(tradeId);

        String avatar = followTraderInfoEntity.getAvatar();

@@ -496,7 +496,6 @@
        

        Integer maxFollowCnt = followFollowerSettingEntity.getMaxFollowCnt();

        documentaryOrderSetInfoVo.setMaxFollowCnt(maxFollowCnt);

        
        

        return Result.ok(documentaryOrderSetInfoVo);

    }

@@ -558,7 +557,7 @@
        MemberEntity memberEntity = memberDao.selectById(memberId);

        Integer certifyStatus = memberEntity.getCertifyStatus();

        if(MemberEntity.CERTIFY_STATUS_Y != certifyStatus) {

            return Result.ok(MessageSourceUtils.getString("member_controller_0009"));

            return Result.fail(MessageSourceUtils.getString("member_controller_0009"));

        }

        //新增【交易员信息表】数据

        FollowTraderInfoEntity followTraderInfoEntity = new FollowTraderInfoEntity();