From ec74f248ddac773a6024a243a37346bd2e9bb028 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 15 Oct 2020 23:46:09 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin_agent
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractOrderServiceImpl.java | 14 ++++++++++++++
1 files changed, 14 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..055633d 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
@@ -4,21 +4,35 @@
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;
/**
* @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<AgentReturnEntity> findAgentReturnList(AgentReturnEntity agentReturnEntity, QueryRequest request) {
+ Page<AgentReturnEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return agentReturnMapper.selectAgentReturnList(page, agentReturnEntity);
+ }
}
--
Gitblit v1.9.1