From 1e2725d0ab46e73cf21279f816f2320b626fbd3e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 02 Jun 2020 16:16:32 +0800
Subject: [PATCH] 20200602 代码提交
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
index 0824dd1..cfa7f95 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -20,13 +20,16 @@
import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;
import com.xcong.excoin.utils.CacheSettingUtils;
import com.xcong.excoin.utils.CalculateUtil;
+import com.xcong.excoin.rabbit.pricequeue.OrderModel;
import com.xcong.excoin.utils.CoinTypeConvert;
import com.xcong.excoin.utils.RedisUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.util.List;
/**
* @author wzy
@@ -54,6 +57,7 @@
@Resource
private RedisUtils redisUtils;
+ @Transactional(rollbackFor = Exception.class)
@Override
public Result submitOrder(SubmitOrderDto submitOrderDto) {
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
@@ -113,7 +117,7 @@
ContractHoldOrderEntity holdOrderEntity = new ContractHoldOrderEntity();
holdOrderEntity.setMemberId(memberEntity.getId());
holdOrderEntity.setOrderNo(commonService.generateOrderNo(memberEntity.getId()));
- holdOrderEntity.setPotionType(ContractEntrustOrderEntity.POSITION_TYPE_ADD);
+ holdOrderEntity.setPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ADD);
holdOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_MARK);
holdOrderEntity.setSymbol(submitOrderDto.getSymbol());
holdOrderEntity.setSymbolCnt(submitOrderDto.getSymbolCnt());
@@ -140,4 +144,21 @@
}
return Result.fail("fail");
}
+
+ @Override
+ public int updateContractHoldOrderCanNotClosingByIds(List<OrderModel> list, String batchNo){
+ return contractHoldOrderDao.updateContractHoldOrderCanNotClosingByIds(list,batchNo);
+ }
+
+ @Override
+ public List<ContractHoldOrderEntity> selectContractHoldOrderByBatchNo(String batchNo) {
+ return contractHoldOrderDao.selectContractHoldOrderByBatchNo(batchNo);
+ }
+
+ @Override
+ public void updateOrderIsCanClosingAndBatchNoById(Long id) {
+ contractHoldOrderDao.updateOrderIsCanClosingAndBatchNoById(id);
+ }
+
+
}
--
Gitblit v1.9.1