From 4dff18fc545706cc9ea09e0cdf4daeebc16b064f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 03 Jun 2020 19:26:05 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
index 0cc3d15..3e6f326 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
@@ -121,9 +121,7 @@
 
             int i = contractEntrustOrderDao.insert(entrustOrderEntity);
 
-            walletContract.setFrozenBalance(walletContract.getFrozenBalance().add(entrustTotalAmount));
-            walletContract.setAvailableBalance(walletContract.getAvailableBalance().subtract(entrustTotalAmount));
-            memberWalletContractDao.updateById(walletContract);
+            memberWalletContractDao.increaseWalletContractBalanceById(entrustTotalAmount.negate(), null, entrustTotalAmount, walletContract.getId());
             if (i > 0) {
 
                 // 发送委托单队列消息
@@ -149,9 +147,9 @@
     }
 
     @Override
-    public Result findEntrustOrderList() {
+    public Result findEntrustOrderList(String symbol) {
         MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
-        List<ContractEntrustOrderEntity> list = contractEntrustOrderDao.selectEntrustOrderListByMemberId(memberEntity.getId());
+        List<ContractEntrustOrderEntity> list = contractEntrustOrderDao.selectEntrustOrderListByMemberIdAndSymbol(memberEntity.getId(), symbol);
         List<ContractEntrustVo> resultList = ContractEntrustOrderEntityMapper.INSTANCE.entityListToVoList(list);
         return Result.ok(resultList);
     }
@@ -170,9 +168,7 @@
         MemberWalletContractEntity walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), MemberWalletCoinEnum.WALLETCOINCODE.getValue());
 
         BigDecimal total = entrustOrderEntity.getEntrustAmount();
-        walletContractEntity.setAvailableBalance(walletContractEntity.getAvailableBalance().add(total));
-        walletContractEntity.setFrozenBalance(walletContractEntity.getFrozenBalance().subtract(total));
-        memberWalletContractDao.updateById(walletContractEntity);
+        memberWalletContractDao.increaseWalletContractBalanceById(total, null, total.negate(), walletContractEntity.getId());
 
         ContractOrderEntity orderEntity = ContractEntrustOrderEntityMapper.INSTANCE.entrustOrderToOrder(entrustOrderEntity);
         orderEntity.setTradeType(ContractOrderEntity.TRADE_TYPE_MARK_PRICE);

--
Gitblit v1.9.1