From 65c9667d9fbe07dde3bd5311c9cba9d72b30aac7 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 14 Nov 2024 10:59:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=20=E7=BD=AE=E7=A9=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/ysk/cashier/mybatis/entity/TbActivate.java |  3 +++
 .../mybatis/service/impl/TbActivateServiceImpl.java    | 10 +---------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbActivate.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbActivate.java
index 4fdc0ef0..d3596a4c 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbActivate.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbActivate.java
@@ -1,6 +1,7 @@
 package cn.ysk.cashier.mybatis.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 
@@ -17,10 +18,12 @@ public class TbActivate extends Model<TbActivate> {
     //赠送金额
     private Integer giftAmount;
     //赠送积分
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private Integer giftPoints;
     //是否使用优惠卷 0否 1是
     private Integer isUseCoupon;
     //优惠卷id
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private Integer couponId;
     @TableField(exist = false)
     private String couponName;
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbActivateServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbActivateServiceImpl.java
index 175c8810..af45a72c 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbActivateServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbActivateServiceImpl.java
@@ -45,15 +45,7 @@ public class TbActivateServiceImpl extends ServiceImpl<TbActivateMapper, TbActiv
     @Override
     public void modifyActivate(TbActivate activate) {
         if (Objects.nonNull(activate.getId()) && activate.getId() > 0) {
-            UpdateWrapper<TbActivate> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.setEntity(activate);
-            if (Objects.isNull(activate.getCouponId())) {
-                updateWrapper.set("coupon_id", null);
-            }
-            if (Objects.isNull(activate.getGiftPoints())) {
-                updateWrapper.set("gift_points", null);
-            }
-            activateMapper.update(updateWrapper);
+            activateMapper.updateById(activate);
         } else {
             activateMapper.insert(activate);
         }