From bfa9a4a35662164d5828c0c9416290b776902a2e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 14 May 2021 14:49:40 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding

---
 src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
index fd185ed..17f2ddc 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
@@ -231,12 +231,14 @@
                 quantityOwn = quantityOwn + ydOrderEntity.getQuantity();
             }
         }
-        if(quantityOwn >= limitedNum){
+        int quantityInt = quantity.intValue();
+        if(quantityOwn + quantityInt > limitedNum){
             return Result.fail("产品限购"+limitedNum);
         }
-        if (quantity.compareTo(BigDecimal.valueOf(ydProductEntity.getLimitedNum())) < 1) {
-            return Result.fail("产品限购" + ydProductEntity.getLimitedNum());
-        }
+
+//        if (quantity.compareTo(BigDecimal.valueOf(ydProductEntity.getLimitedNum())) < 1) {
+//            return Result.fail("产品限购" + ydProductEntity.getLimitedNum());
+//        }
         BigDecimal salePrice = ydProductEntity.getSalePrice();
         //剩余产品数量
         BigDecimal surplusT = ydProductEntity.getSurplusT();

--
Gitblit v1.9.1