From 59baf780dc74b95b65c453a9cb6bd8e1d9f3a2b1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 03 Jun 2020 15:09:46 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

---
 src/main/java/com/xcong/excoin/modules/contract/mapper/ContractEntrustOrderEntityMapper.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/mapper/ContractEntrustOrderEntityMapper.java b/src/main/java/com/xcong/excoin/modules/contract/mapper/ContractEntrustOrderEntityMapper.java
index bd2d3dc..e926278 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/mapper/ContractEntrustOrderEntityMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/mapper/ContractEntrustOrderEntityMapper.java
@@ -1,6 +1,7 @@
 package com.xcong.excoin.modules.contract.mapper;
 
 import com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity;
+import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
 import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
 import com.xcong.excoin.modules.contract.parameter.dto.SubmitEntrustDto;
 import com.xcong.excoin.modules.contract.parameter.vo.ContractEntrustVo;
@@ -22,6 +23,7 @@
 
     @Mapping(source = "entrustPrice", target = "entrustOpeningPrice")
     @Mapping(source = "createTime", target = "entrustTime")
+    @Mapping(source = "entrustAmount", target = "prePaymentAmount")
     public abstract ContractOrderEntity entrustOrderToOrder(ContractEntrustOrderEntity orderEntity);
 
     @Mapping(source = "createTime", target = "entrustTime")
@@ -30,4 +32,6 @@
 
     public abstract List<ContractEntrustVo> entityListToVoList(List<ContractEntrustOrderEntity> list);
 
+    public abstract ContractHoldOrderEntity entrustOrderToHoldOrder(ContractEntrustOrderEntity entrustOrderEntity);
+
 }

--
Gitblit v1.9.1