From 6c95a784f86387b955433695fd5b2f8a1ec9f4e0 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Fri, 15 Oct 2021 15:24:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E6=B4=BB=E5=8A=A8=E6=9E=81?=
 =?UTF-8?q?=E7=AB=AF=E6=83=85=E5=86=B5=E4=B8=BA=E8=B4=9F=E6=95=B0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86=E3=80=82=20=E7=A0=8D=E4=BB=B7?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D=E5=B0=8F?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../promotion/entity/vos/kanjia/KanjiaActivityGoodsVO.java | 7 +++++++
 .../promotion/serviceimpl/KanjiaActivityServiceImpl.java   | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/kanjia/KanjiaActivityGoodsVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/kanjia/KanjiaActivityGoodsVO.java
index f5ae1f66..b48ae9cf 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/kanjia/KanjiaActivityGoodsVO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/kanjia/KanjiaActivityGoodsVO.java
@@ -19,6 +19,13 @@ public class KanjiaActivityGoodsVO {
     @ApiModelProperty(value = "最低购买金额")
     private Double purchasePrice;
 
+    public Double getPurchasePrice() {
+        if (purchasePrice < 0) {
+            return 0D;
+        }
+        return purchasePrice;
+    }
+
     @ApiModelProperty(value = "活动库存")
     private Integer stock;
 
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityServiceImpl.java
index 718a515f..94ac9b03 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityServiceImpl.java
@@ -204,8 +204,7 @@ public class KanjiaActivityServiceImpl extends ServiceImpl<KanJiaActivityMapper,
         //获取随机砍价金额
         BigDecimal bigDecimal = RandomUtil.randomBigDecimal(Convert.toBigDecimal(kanjiaActivityGoods.getLowestPrice()),
                 Convert.toBigDecimal(kanjiaActivityGoods.getHighestPrice()));
-        bigDecimal.setScale(2, BigDecimal.ROUND_UP);
-        return Convert.toDouble(bigDecimal, 0.0);
+        return bigDecimal.setScale(2, BigDecimal.ROUND_UP).doubleValue();
 
     }