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

---
 src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 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 f1f7644..830576d 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
@@ -63,6 +63,10 @@
             throw new GlobalException("委托单不存在");
         }
 
+        if (member.getId().equals(entrustOrder.getMemberId())) {
+            throw new GlobalException("不能购买自己的委托单");
+        }
+
         if (!OtcEntrustOrder.ORDER_TYPE_S.equals(entrustOrder.getOrderType())) {
             throw new GlobalException("无法购买");
         }
@@ -114,6 +118,10 @@
         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())) {
@@ -241,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
@@ -322,4 +330,17 @@
 
         return Result.ok(saleDetail);
     }
+
+    @Override
+    public void cancelOrder(Long id) {
+        OtcOrder otcOrder = this.baseMapper.selectById(id);
+        if (otcOrder == null) {
+            throw new GlobalException("订单不存在");
+        }
+
+        if (!OtcOrder.STATUS_SUBMIT.equals(otcOrder.getStatus())) {
+            throw new GlobalException("不能取消");
+        }
+        this.baseMapper.updateOrderStatusByOrderNo(OtcOrder.STATUS_CANCEL, null, otcOrder.getOrderNo());
+    }
 }

--
Gitblit v1.9.1