20200729 代码提交

xiaoyong931011

2020-07-29 31708e476006deafa4c508ed82843495d59b7577

20200729 代码提交

 src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java

@@ -60,7 +60,10 @@
     */
    public static final int ORDER_TYPE_CLOSE_LESS = 4;


    /**
     * 订单类型1普通合约2跟单合约
     */
    private int contractType;
    /**
     * 会员Id
     */

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

@@ -5,17 +5,22 @@
import org.springframework.beans.factory.annotation.Autowired;

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

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

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

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

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.coin.parameter.dto.RecordsPageDto;

import com.xcong.excoin.modules.coin.parameter.vo.MemberAgentIntoInfoVo;

import com.xcong.excoin.modules.documentary.dto.HistoryOrderRecordsDto;

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

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

import com.xcong.excoin.modules.member.parameter.vo.AppVersionListVo;



import io.swagger.annotations.Api;

import io.swagger.annotations.ApiImplicitParam;

import io.swagger.annotations.ApiImplicitParams;

import io.swagger.annotations.ApiOperation;

import io.swagger.annotations.ApiResponse;

import io.swagger.annotations.ApiResponses;

@@ -50,6 +55,19 @@
        return documentaryService.getFollowTraderProfitInfo(recordsPageDto);

    }

    

    /**

     *  历史带单

     * @return

     */

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

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

    @GetMapping(value = "/getHistoryOrderRecords")

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

        return documentaryService.getWalletAgentIntoRecords(historyOrderRecordsDto);

    }

	
	
	
    

    

    


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

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



import javax.validation.constraints.Min;

import javax.validation.constraints.NotNull;



import io.swagger.annotations.ApiModel;

import io.swagger.annotations.ApiModelProperty;

import lombok.Data;



@Data

@ApiModel(value = "HistoryOrderRecordsDto", description = "历史带单参数接受类")

public class HistoryOrderRecordsDto {

	
    @NotNull

    @Min(1)

    @ApiModelProperty(value = "第几页", example = "1")

    private int pageNum;



    @NotNull

    @ApiModelProperty(value = "每页数量", example = "10")

    private int pageSize;

    
    @NotNull

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

    private Long memberId;



}


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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;

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

import com.xcong.excoin.modules.coin.parameter.dto.RecordsPageDto;

import com.xcong.excoin.modules.documentary.dto.HistoryOrderRecordsDto;

import com.xcong.excoin.modules.documentary.entity.FollowTraderProfitInfoEntity;



public interface DocumentaryService extends IService<FollowTraderProfitInfoEntity> {

@@ -13,4 +14,6 @@


    public Result getFollowTraderProfitInfo(@Valid RecordsPageDto recordsPageDto);



    public Result getWalletAgentIntoRecords(@Valid HistoryOrderRecordsDto historyOrderRecordsDto);



}


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

@@ -20,6 +20,7 @@
import com.xcong.excoin.modules.documentary.dao.FollowTraderInfoDao;

import com.xcong.excoin.modules.documentary.dao.FollowTraderProfitDetailDao;

import com.xcong.excoin.modules.documentary.dao.FollowTraderProfitInfoDao;

import com.xcong.excoin.modules.documentary.dto.HistoryOrderRecordsDto;

import com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity;

import com.xcong.excoin.modules.documentary.entity.FollowTraderProfitInfoEntity;

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

@@ -87,4 +88,10 @@
        return Result.ok(FollowTraderProfitInfoVoList);

    }



    @Override

    public Result getWalletAgentIntoRecords(@Valid HistoryOrderRecordsDto historyOrderRecordsDto) {

        // TODO Auto-generated method stub

        return null;

    }



}