20200723 代码提交

xiaoyong931011

2020-07-23 85a8ca034763c90625c2a6bf844c1d0656cd5591

 src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java

@@ -12,6 +12,7 @@
import com.xcong.excoin.common.entity.QueryRequest;

import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;

import com.xcong.excoin.modules.member.entity.MemberEntity;

import com.xcong.excoin.modules.trademanage.entity.AgentReturnEntity;

import com.xcong.excoin.modules.trademanage.entity.ContractHoldOrderEntity;

import com.xcong.excoin.modules.trademanage.entity.ContractOrderEntity;

import com.xcong.excoin.modules.trademanage.service.TradeManageService;

@@ -34,6 +35,22 @@
       Map<String, Object> data = getDataTable(tradeManageService.findContractHoldOrderListInPage(contractHoldOrderEntity, request));

       return new FebsResponse().success().data(data);

   }

   /**

    * 当前持仓---列表alone

    */

   @GetMapping("contractHoldOrderAlone")

   public FebsResponse contractHoldOrderAlone(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request) {

      Map<String, Object> data = getDataTable(tradeManageService.findContractHoldOrderAloneInPage(contractHoldOrderEntity, request));

      return new FebsResponse().success().data(data);

   }

   /**

    * 当前持仓---列表Test

    */

   @GetMapping("contractHoldOrderAloneTest")

   public FebsResponse contractHoldOrderAloneTest(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request) {

      Map<String, Object> data = getDataTable(tradeManageService.findContractHoldOrderAloneTestInPage(contractHoldOrderEntity, request));

      return new FebsResponse().success().data(data);

   }

   

   /**

     * 账户信息---列表

@@ -45,11 +62,56 @@
    }

    

    /**

     * 账户信息---列表alone

     */

    @GetMapping("memberAccountInfoAlone")

    public FebsResponse memberAccountInfoAlone(MemberEntity memberEntity, QueryRequest request) {

       Map<String, Object> data = getDataTable(tradeManageService.findmemberAccountInfoAloneListInPage(memberEntity, request));

       return new FebsResponse().success().data(data);

    }

    
    /**

     * 账户信息---列表Test

     */

    @GetMapping("memberAccountInfoAloneTest")

    public FebsResponse memberAccountInfoAloneTest(MemberEntity memberEntity, QueryRequest request) {

       Map<String, Object> data = getDataTable(tradeManageService.findmemberAccountInfoAloneTestListInPage(memberEntity, request));

       return new FebsResponse().success().data(data);

    }

    
    /**

     * 返佣明细---列表

     */

    @GetMapping("memberAgentReturnInfo")

    public FebsResponse memberAgentReturnInfo(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {

        Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfoInPage(memberAccountMoneyChangeEntity, request));

        return new FebsResponse().success().data(data);

    }

    
    /**

     * 返佣明细---alone

     */

    @GetMapping("memberAgentReturnInfoAlone")

    public FebsResponse memberAgentReturnInfoAlone(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {

        Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfoAloneInPage(memberAccountMoneyChangeEntity, request));

        return new FebsResponse().success().data(data);

    }

    
    /**

     * 返佣明细---Test

     */

    @GetMapping("memberAgentReturnInfoAloneTest")

    public FebsResponse memberAgentReturnInfoAloneTest(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {

       Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfoAloneTestInPage(memberAccountMoneyChangeEntity, request));

       return new FebsResponse().success().data(data);

    }

    
    /**

     * 返佣总明细---列表

     */

    @GetMapping("memberAgentReturnInfos")

    public FebsResponse memberAgentReturnInfos(AgentReturnEntity agentReturnEntity, QueryRequest request) {

        Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfosInPage(agentReturnEntity, request));

        return new FebsResponse().success().data(data);

    }



@@ -62,5 +124,30 @@
       return new FebsResponse().success().data(data);

    }

    

    /**

     * 全部历史委托明细---列表

     */

    @GetMapping("historyOrderInfoAll")

    public FebsResponse historyOrderInfoAll(ContractOrderEntity contractOrderEntity, QueryRequest request) {

       Map<String, Object> data = getDataTable(tradeManageService.findMemberHistoryOrderAllInfoInPage(contractOrderEntity, request));

       return new FebsResponse().success().data(data);

    }

    /**

     * 历史委托明细---alone

     */

    @GetMapping("historyOrderInfoAlone")

    public FebsResponse historyOrderInfoAlone(ContractOrderEntity contractOrderEntity, QueryRequest request) {

       Map<String, Object> data = getDataTable(tradeManageService.findHistoryOrderInfoAloneInfoInPage(contractOrderEntity, request));

       return new FebsResponse().success().data(data);

    }

    /**

     * 历史委托明细---Test

     */

    @GetMapping("historyOrderInfoAloneTest")

    public FebsResponse historyOrderInfoAloneTest(ContractOrderEntity contractOrderEntity, QueryRequest request) {

       Map<String, Object> data = getDataTable(tradeManageService.findhistoryOrderInfoAloneTestInfoInPage(contractOrderEntity, request));

       return new FebsResponse().success().data(data);

    }

    


}