20200715 代码提交

xiaoyong931011

2020-07-15 d5035b6d201f091e72470744932ecdeb54a5d2be

 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;

@@ -52,6 +53,15 @@
        Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfoInPage(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 +72,14 @@
       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);

    }

    


}