20200731 代码提交

xiaoyong931011

2020-07-31 5b825980be9965173b159209f71456e71447f57e

20200731 代码提交

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

@@ -40,7 +40,7 @@
@RestController

@Slf4j

@RequestMapping(value = "/api/documentary")

@Api(value = "MemberQuickBuySaleController", tags = "跟单")

@Api(value = "DocumentaryController", tags = "跟单---跟随者")

public class DocumentaryController {

    

    @Resource


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

New file
@@ -0,0 +1,38 @@
package com.xcong.excoin.modules.documentary.controller;



import javax.annotation.Resource;



import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;



import com.xcong.excoin.common.response.Result;

import com.xcong.excoin.modules.documentary.service.DocumentaryService;

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



import io.swagger.annotations.Api;

import io.swagger.annotations.ApiOperation;

import io.swagger.annotations.ApiResponse;

import io.swagger.annotations.ApiResponses;

import lombok.extern.slf4j.Slf4j;



@RestController

@Slf4j

@RequestMapping(value = "/api/trader")

@Api(value = "TraderController", tags = "跟单---交易员")

public class TraderController {

	
    @Resource

    DocumentaryService documentaryService;

	
    /**

     *  成为交易员---立即入驻

     */

    @ApiOperation(value="成为交易员---立即入驻", notes="成为交易员---立即入驻")

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

    @GetMapping(value = "/getTraderInfo")

    public Result  getMemberIsTradeInfo() {

        return documentaryService.getMemberIsTradeInfo();

    }



}


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

@@ -241,8 +241,7 @@
    public Result getHistoryMyFollowOrderRecords(@Valid MyFollowOrderDto myFollowOrderDto) {

        //获取用户ID

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

        Page<MyFollowOrderVo> result = new Page<>();

        List<MyFollowOrderVo> myFollowOrderVos = result.getRecords();

        List<MyFollowOrderVo> myFollowOrderVos = new ArrayList<>();

        //历史跟单

            Page<ContractOrderEntity> page = new Page<>(myFollowOrderDto.getPageNum(), myFollowOrderDto.getPageSize());

            IPage<ContractOrderEntity> contractOrderEntitys = followFollowerProfitDao.getMyFollowOrderHistoryRecords(page, memberId);

@@ -287,8 +286,7 @@
        Long memberId = LoginUserUtils.getAppLoginUser().getId();

        MemberEntity member = memberDao.selectById(memberId);

        

        Page<MyFollowOrderVo> result = new Page<>();

        List<MyFollowOrderVo> myFollowOrderVos = result.getRecords();

        List<MyFollowOrderVo> myFollowOrderVos = new ArrayList<>();

            //当前跟单    

            Page<ContractHoldOrderEntity> page = new Page<>(myFollowOrderDto.getPageNum(), myFollowOrderDto.getPageSize());

            IPage<ContractHoldOrderEntity> contractHoldOrderEntitys = followFollowerProfitDao.getMyFollowOrderNowRecords(page, memberId);


 src/main/resources/mapper/documentary/FollowFollowerProfitDao.xml

@@ -40,7 +40,7 @@
            and contract_type = 2
            and order_type in (3,4)
            and closing_type not in (4,5)
        order by opening_time desc
        order by create_time desc
    </select>
    <select id="getMyFollowOrderNowRecords" resultType="com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity">
        SELECT
@@ -50,7 +50,7 @@
        WHERE 
            member_id = #{memberId} 
            and contract_type = 2
        order by opening_time desc
        order by create_time desc
    </select>
    
    <select id="getFollowOrderNowRecords" resultType="com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity">