From 438f4c333e1542fdf3b57d220da2350b343043f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Tue, 5 Nov 2024 15:40:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=A8=A1=E5=9D=97=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/TbPointsBasicSettingServiceImpl.java | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsBasicSettingServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsBasicSettingServiceImpl.java
index fa4ff0f..ce03c72 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsBasicSettingServiceImpl.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsBasicSettingServiceImpl.java
@@ -30,15 +30,17 @@ public class TbPointsBasicSettingServiceImpl extends ServiceImpl<TbPointsBasicSe
     @Transactional(rollbackFor = Exception.class)
     public boolean save(TbPointsBasicSetting entity) {
         try {
-            Assert.notNull(entity.getShopId(), "{}({})不能为空", "店铺id","shopId");
-            Assert.notNull(entity.getEnableRewards(), "{}({})不能为空", "开启消费赠送积分","enableRewards");
-            Assert.notNull(entity.getConsumeAmount(), "{}({})不能为空", "每消费xx元赠送1积分","consumeAmount");
-            Assert.notNull(entity.getEnableDeduction(), "{}({})不能为空", "开启下单积分抵扣","enableDeduction");
-            Assert.notNull(entity.getMinPaymentAmount(), "{}({})不能为空", "下单实付抵扣门槛","minPaymentAmount");
-            Assert.notNull(entity.getMaxDeductionRatio(), "{}({})不能为空", "下单最高抵扣比例","maxDeductionRatio");
-            Assert.notNull(entity.getEquivalentPoints(), "{}({})不能为空", "下单抵扣积分比例","equivalentPoints");
-            Assert.notNull(entity.getEnablePointsMall(), "{}({})不能为空", "开启积分商城","enablePointsMall");
-            Assert.notEmpty(entity.getBrowseMode(), "{}({})不能为空", "浏览模式","browseMode");
+            Assert.notNull(entity.getShopId(), "{}({})不能为空", "店铺id", "shopId");
+            Assert.notNull(entity.getEnableRewards(), "{}({})不能为空", "开启消费赠送积分", "enableRewards");
+            Assert.notEmpty(entity.getRewardsGroup(), "{}({})不能为空", "赠积分适用群体", "rewardsGroup");
+            Assert.notNull(entity.getConsumeAmount(), "{}({})不能为空", "每消费xx元赠送1积分", "consumeAmount");
+            Assert.notNull(entity.getEnableDeduction(), "{}({})不能为空", "开启下单积分抵扣", "enableDeduction");
+            Assert.notEmpty(entity.getDeductionGroup(), "{}({})不能为空", "抵扣适用群体", "deductionGroup");
+            Assert.notNull(entity.getMinPaymentAmount(), "{}({})不能为空", "下单实付抵扣门槛", "minPaymentAmount");
+            Assert.notNull(entity.getMaxDeductionRatio(), "{}({})不能为空", "下单最高抵扣比例", "maxDeductionRatio");
+            Assert.notNull(entity.getEquivalentPoints(), "{}({})不能为空", "下单抵扣积分比例", "equivalentPoints");
+            Assert.notNull(entity.getEnablePointsMall(), "{}({})不能为空", "开启积分商城", "enablePointsMall");
+            Assert.notEmpty(entity.getBrowseMode(), "{}({})不能为空", "浏览模式", "browseMode");
         } catch (IllegalArgumentException e) {
             throw new MsgException(e.getMessage());
         }