From f8034d74a80c0ccc989bd79dc864dbf7cb02d03c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 20 May 2021 19:50:37 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
index 9368b80..0086fec 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
@@ -56,11 +56,15 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void buyOrder(OtcOrderAddDto orderAddDto) {
+    public Result buyOrder(OtcOrderAddDto orderAddDto) {
         MemberEntity member = LoginUserUtils.getAppLoginUser();
         OtcEntrustOrder entrustOrder = otcEntrustOrderDao.selectById(orderAddDto.getId());
         if (entrustOrder == null) {
             throw new GlobalException("委托单不存在");
+        }
+
+        if (member.getId().equals(entrustOrder.getMemberId())) {
+            throw new GlobalException("不能购买自己的委托单");
         }
 
         if (!OtcEntrustOrder.ORDER_TYPE_S.equals(entrustOrder.getOrderType())) {
@@ -103,15 +107,21 @@
         otcEntrustOrderDao.updateRemainAmount(entrustOrder.getId(), orderAddDto.getUsdtAmount().negate());
         this.baseMapper.insert(otcOrder);
         this.baseMapper.insert(sale);
+
+        return Result.ok("购买成功", otcOrder.getId());
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void saleOrder(OtcOrderAddDto orderAddDto) {
+    public Result saleOrder(OtcOrderAddDto orderAddDto) {
         MemberEntity member = LoginUserUtils.getAppLoginUser();
         OtcEntrustOrder entrustOrder = otcEntrustOrderDao.selectById(orderAddDto.getId());
         if (entrustOrder == null) {
             throw new GlobalException("委托单不存在");
+        }
+
+        if (member.getId().equals(entrustOrder.getMemberId())) {
+            throw new GlobalException("不能购买自己的委托单");
         }
 
         if (!OtcEntrustOrder.ORDER_TYPE_B.equals(entrustOrder.getOrderType())) {
@@ -171,6 +181,7 @@
         this.baseMapper.insert(buy);
 
         memberWalletCoinDao.updateFrozenBalance(member.getId(), wallet.getId(), orderAddDto.getUsdtAmount());
+        return Result.ok("出售成功", otcOrder.getId());
     }
 
     @Override
@@ -238,7 +249,7 @@
         // 出售者钱包冻结减少币
         memberWalletCoinDao.reduceFrozenBalance(saleWallet.getId(), buyOrder.getCoinAmount());
 
-        this.baseMapper.updateOrderStatusByOrderNo(OtcOrder.STATUS_PAY, null, otcOrder.getOrderNo());
+        this.baseMapper.updateOrderStatusByOrderNo(OtcOrder.STATUS_FINISH, null, otcOrder.getOrderNo());
     }
 
     @Override

--
Gitblit v1.9.1