From 1c23bfe752fea2e815daa4bdd93859dee9e5b87c Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 22 Apr 2021 18:44:50 +0800 Subject: [PATCH] 20210422 --- src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractOrderServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractOrderServiceImpl.java index 7abd971..f55834b 100644 --- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractOrderServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractOrderServiceImpl.java @@ -1,24 +1,63 @@ package com.xcong.excoin.modules.contract.service.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xcong.excoin.common.entity.QueryRequest; +import com.xcong.excoin.modules.contract.entity.AgentReturnEntity; import com.xcong.excoin.modules.contract.entity.ContractOrderEntity; +import com.xcong.excoin.modules.contract.mapper.AgentReturnMapper; import com.xcong.excoin.modules.contract.mapper.ContractOrderMapper; import com.xcong.excoin.modules.contract.service.IContractOrderService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; + +import java.util.List; /** * @author wzy * @date 2020-06-19 **/ +@Slf4j @Service +@RequiredArgsConstructor public class ContractOrderServiceImpl extends ServiceImpl<ContractOrderMapper, ContractOrderEntity> implements IContractOrderService { + + private final AgentReturnMapper agentReturnMapper; @Override public IPage<ContractOrderEntity> findHistoryOrderListInPage(ContractOrderEntity contractOrderEntity, QueryRequest request) { Page<ContractOrderEntity> page = new Page<>(request.getPageNum(), request.getPageSize()); return this.baseMapper.selectHistoryOrderListInPage(page, contractOrderEntity); } + + @Override + public IPage<ContractOrderEntity> findHistoryDocumentaryListInPage(ContractOrderEntity contractOrderEntity, QueryRequest request) { + Page<ContractOrderEntity> page = new Page<>(request.getPageNum(), request.getPageSize()); + return this.baseMapper.selectHistoryDocumentaryListInPage(page, contractOrderEntity); + } + + @Override + public IPage<ContractOrderEntity> findHistoryDocumentaryprofitListInPage(ContractOrderEntity contractOrderEntity, QueryRequest request) { + //获取当前订单的全部跟随合约List<Long> IDs + ContractOrderEntity contractOrderEntityTrade = this.baseMapper.selectById(contractOrderEntity.getId()); + String orderNoTrade = contractOrderEntityTrade.getOrderNo(); + List<Long> ids = this.baseMapper.selectFollowContractIdList(orderNoTrade); + if(CollUtil.isEmpty(ids)){ + return null; + } + contractOrderEntity.setIDs(ids); + //查询全部跟单合约和返佣 + Page<ContractOrderEntity> page = new Page<>(request.getPageNum(), request.getPageSize()); + IPage<ContractOrderEntity> contractOrderEntityIPage = this.baseMapper.selectHistoryDocumentaryprofitListInPage(page, contractOrderEntity); + return this.baseMapper.selectHistoryDocumentaryprofitListInPage(page, contractOrderEntity); + } + + @Override + public IPage<AgentReturnEntity> findAgentReturnList(AgentReturnEntity agentReturnEntity, QueryRequest request) { + Page<AgentReturnEntity> page = new Page<>(request.getPageNum(), request.getPageSize()); + return agentReturnMapper.selectAgentReturnList(page, agentReturnEntity); + } } -- Gitblit v1.9.1