20210423

xiaoyong931011

2021-04-23 fe86da92bf703556de6030ec40f3c3bf5b999f91

 src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java

@@ -47,13 +47,42 @@
        return new FebsResponse().success().data(data);
    }

    @GetMapping("getHistoryDocumentaryList")
    public FebsResponse getHistoryDocumentaryList(ContractOrderEntity contractOrderEntity, QueryRequest request) {
        User user = getCurrentUser();
        if (user.getType().equals(FebsConstant.USER_TYPE_ADMIN)) {
            contractOrderEntity.setRefererIds(FebsConstant.DEFAULT_REFERER_ID);
        } else {
            contractOrderEntity.setRefererIds(user.getInviteId());
        }
        Map<String, Object> data = getDataTable(contractOrderService.findHistoryDocumentaryListInPage(contractOrderEntity, request));
        return new FebsResponse().success().data(data);
    }

    @GetMapping("getHistoryDocumentaryprofitList")
    public FebsResponse getHistoryDocumentaryprofitList(ContractOrderEntity contractOrderEntity, QueryRequest request,Integer parentId) {
        User user = getCurrentUser();
        if (user.getType().equals(FebsConstant.USER_TYPE_ADMIN)) {
            contractOrderEntity.setRefererIds(FebsConstant.DEFAULT_REFERER_ID);
        } else {
            contractOrderEntity.setRefererIds(user.getInviteId());
        }
        if(parentId==null){
            ViewController.idFromMember=0;
        }
        contractOrderEntity.setId(ViewController.idFromMember);
        Map<String, Object> data = getDataTable(contractOrderService.findHistoryDocumentaryprofitListInPage(contractOrderEntity, request));
        return new FebsResponse().success().data(data);
    }


    @GetMapping("getHistoryList")
    public FebsResponse getHistoryList(ContractOrderEntity contractOrderEntity, QueryRequest request) {
        User user = getCurrentUser();
        if (user.getType().equals(FebsConstant.USER_TYPE_ADMIN)) {
            contractOrderEntity.setRefererId(FebsConstant.DEFAULT_REFERER_ID);
            contractOrderEntity.setRefererIds(FebsConstant.DEFAULT_REFERER_ID);
        } else {
            contractOrderEntity.setRefererId(user.getInviteId());
            contractOrderEntity.setRefererIds(user.getInviteId());
        }
        Map<String, Object> data = getDataTable(contractOrderService.findHistoryOrderListInPage(contractOrderEntity, request));
        return new FebsResponse().success().data(data);
@@ -62,7 +91,7 @@
    @GetMapping("getReturnList")
    public FebsResponse getReturnList(AgentReturnEntity agentReturnEntity, QueryRequest request) {
        User user = getCurrentUser();
        agentReturnEntity.setReturnInviteId(FebsConstant.USER_TYPE_ADMIN.equals(user.getType()) ? FebsConstant.DEFAULT_REFERER_ID : user.getInviteId());
        agentReturnEntity.setInviteId(FebsConstant.USER_TYPE_ADMIN.equals(user.getType()) ? FebsConstant.DEFAULT_REFERER_ID : user.getInviteId());

        Map<String, Object> data = getDataTable(contractOrderService.findAgentReturnList(agentReturnEntity, request));
        return new FebsResponse().success().data(data);