modify

wzy

2020-10-15 396eb7eac27d0bcb9466337b3a89977b2607890c

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

@@ -4,6 +4,7 @@
import com.xcong.excoin.common.entity.FebsConstant;
import com.xcong.excoin.common.entity.FebsResponse;
import com.xcong.excoin.common.entity.QueryRequest;
import com.xcong.excoin.modules.contract.entity.AgentReturnEntity;
import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
import com.xcong.excoin.modules.contract.service.IContractHoldOrderService;
@@ -50,11 +51,20 @@
    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);
    }

    @GetMapping("getReturnList")
    public FebsResponse getReturnList(AgentReturnEntity agentReturnEntity, QueryRequest request) {
        User user = getCurrentUser();
        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);
    }
}