From c09c784ddf0f1f863288aeba28ecee00ff10766f Mon Sep 17 00:00:00 2001
From: lzx <2602107437@qq.com>
Date: Sun, 6 Oct 2024 12:18:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/jeecg/modules/shopKa/entity/ShopKa.java         | 4 ++++
 .../java/org/jeecg/modules/api/service/impl/ShopApiServiceImpl.java   | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shopKa/entity/ShopKa.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shopKa/entity/ShopKa.java
index 7b01c1f..ec96bcd 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shopKa/entity/ShopKa.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shopKa/entity/ShopKa.java
@@ -64,4 +64,8 @@ public class ShopKa implements Serializable {
 	@Excel(name = "卡单佣金", width = 15)
     @ApiModelProperty(value = "卡单佣金")
     private java.math.BigDecimal orderMoney;
+    /**是否使用过*/
+    @Excel(name = "是否使用过", width = 15)
+    @ApiModelProperty(value = "是否使用过")
+    private java.lang.String isDelete;
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShopApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShopApiServiceImpl.java
index 130869d..160e163 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShopApiServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShopApiServiceImpl.java
@@ -310,6 +310,7 @@ public class ShopApiServiceImpl implements IShopApiService {
             //查询卡单列表配置
             List<ShopKa> list = kaService.lambdaQuery()
                     .eq(ShopKa::getUserId, user.getId())
+                    .eq(ShopKa::getIsDelete, "N")
                     .list();
 
             if(list.size() ==0 ){
@@ -333,7 +334,8 @@ public class ShopApiServiceImpl implements IShopApiService {
                         kaLogService.save(kaLog);
 
                         //删除当前触发的卡单
-                        kaService.removeById(ka.getId());
+                        ka.setIsDelete("Y");
+                        kaService.updateById(ka);
 
                         break;
                     }else{