From e1993a2034d951faa973307a4c1185b4e1689b43 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 14 May 2021 18:41:43 +0800
Subject: [PATCH] 20210514 云顶

---
 src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 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 42e0959..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();
@@ -593,8 +595,12 @@
     @Override
     public Result getXchPrice() {
         log.info("获取XCH当前价");
+        BigDecimal xchNewPrices = BigDecimal.ZERO;
         String xchNewPrice = redisUtils.getString("XCH_NEW_PRICE");
-        return Result.ok(xchNewPrice);
+        if(StrUtil.isNotEmpty(xchNewPrice)){
+            xchNewPrices = new BigDecimal(xchNewPrice);
+        }
+        return Result.ok(xchNewPrices);
     }
 
 

--
Gitblit v1.9.1