From 9beb428f807920b0dd646edbed822313c47961c6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 23 Apr 2021 14:45:56 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/agent
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractOrderServiceImpl.java | 25 +++++++++++++++++++++++++
1 files changed, 25 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 055633d..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,5 +1,6 @@
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;
@@ -12,6 +13,8 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* @author wzy
@@ -31,6 +34,28 @@
}
@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