diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java
index e914a25..6ff3ee3 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java
@@ -1,5 +1,6 @@
package com.chaozhanggui.system.cashierservice.entity;
+import java.math.BigDecimal;
import java.util.Date;
import java.io.Serializable;
@@ -36,11 +37,11 @@ public class TbActivateInRecord implements Serializable {
/**
* 满多少金额
*/
- private Integer fullAmount;
+ private BigDecimal fullAmount;
/**
* 减多少金额
*/
- private Integer discountAmount;
+ private BigDecimal discountAmount;
/**
* 赠送数量
*/
@@ -124,19 +125,19 @@ public class TbActivateInRecord implements Serializable {
this.proId = proId;
}
- public Integer getFullAmount() {
+ public BigDecimal getFullAmount() {
return fullAmount;
}
- public void setFullAmount(Integer fullAmount) {
+ public void setFullAmount(BigDecimal fullAmount) {
this.fullAmount = fullAmount;
}
- public Integer getDiscountAmount() {
+ public BigDecimal getDiscountAmount() {
return discountAmount;
}
- public void setDiscountAmount(Integer discountAmount) {
+ public void setDiscountAmount(BigDecimal discountAmount) {
this.discountAmount = discountAmount;
}
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCoupon.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCoupon.java
index fc54428..685b086 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCoupon.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCoupon.java
@@ -1,5 +1,6 @@
package com.chaozhanggui.system.cashierservice.entity;
+import java.math.BigDecimal;
import java.time.LocalTime;
import java.util.Date;
import java.io.Serializable;
@@ -29,11 +30,11 @@ public class TbShopCoupon implements Serializable {
/**
* 满多少金额
*/
- private Integer fullAmount;
+ private BigDecimal fullAmount;
/**
* 减多少金额
*/
- private Integer discountAmount;
+ private BigDecimal discountAmount;
/**
* 描述
*/
@@ -132,19 +133,19 @@ public class TbShopCoupon implements Serializable {
this.type = type;
}
- public Integer getFullAmount() {
+ public BigDecimal getFullAmount() {
return fullAmount;
}
- public void setFullAmount(Integer fullAmount) {
+ public void setFullAmount(BigDecimal fullAmount) {
this.fullAmount = fullAmount;
}
- public Integer getDiscountAmount() {
+ public BigDecimal getDiscountAmount() {
return discountAmount;
}
- public void setDiscountAmount(Integer discountAmount) {
+ public void setDiscountAmount(BigDecimal discountAmount) {
this.discountAmount = discountAmount;
}
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopShare.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopShare.java
index 8f014af..7118cd4 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopShare.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopShare.java
@@ -119,9 +119,9 @@ public class TbShopShare implements Serializable {
//1 满减 2 商品
private Integer type;
//满多少金额
- private Integer fullAmount;
+ private BigDecimal fullAmount;
//优惠多少金额
- private Integer discountAmount;
+ private BigDecimal discountAmount;
//使用描述
private String useDetail;
//商品描述
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopCouponServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopCouponServiceImpl.java
index a55248c..de88c40 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopCouponServiceImpl.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopCouponServiceImpl.java
@@ -88,7 +88,7 @@ public class TbShopCouponServiceImpl implements TbShopCouponService {
TbShopCoupon tbShopCoupon = couponMapper.queryById(tbUserCouponVo.getCouponId());
StringBuilder useRestrictions = new StringBuilder("每天 ");
if (tbShopCoupon.getType().equals(1)) {
- if (amount.compareTo(new BigDecimal(tbShopCoupon.getFullAmount())) < 0) {
+ if (amount.compareTo(tbShopCoupon.getFullAmount()) < 0) {
isUse = false;
}
}
diff --git a/src/main/resources/mapper/TbActivateInRecordMapper.xml b/src/main/resources/mapper/TbActivateInRecordMapper.xml
index e87fbc0..1c6a91e 100644
--- a/src/main/resources/mapper/TbActivateInRecordMapper.xml
+++ b/src/main/resources/mapper/TbActivateInRecordMapper.xml
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/src/main/resources/mapper/TbProductMapper.xml b/src/main/resources/mapper/TbProductMapper.xml
index eafd686..54d0c70 100644
--- a/src/main/resources/mapper/TbProductMapper.xml
+++ b/src/main/resources/mapper/TbProductMapper.xml
@@ -937,7 +937,7 @@