From 708e925bf0724a58586a5a497d6d7c55fda96958 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Mon, 11 Nov 2024 16:02:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0,=E5=88=A0=E9=99=A4=E6=97=B6=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89=E7=94=A8=E6=88=B7=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/common/entity/BookBuyConfigEntity.java     |  6 ++++++
 .../modules/master/controller/BuyConfigController.java | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/main/java/com/peanut/modules/common/entity/BookBuyConfigEntity.java b/src/main/java/com/peanut/modules/common/entity/BookBuyConfigEntity.java
index ab2fbd98..4ba98a64 100644
--- a/src/main/java/com/peanut/modules/common/entity/BookBuyConfigEntity.java
+++ b/src/main/java/com/peanut/modules/common/entity/BookBuyConfigEntity.java
@@ -1,6 +1,7 @@
 package com.peanut.modules.common.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
@@ -58,5 +59,10 @@ public class BookBuyConfigEntity implements Serializable {
 	private int effective;
 	private Date startTime;
 	private Date endTime;
+	/**
+	 * 删除标记
+	 */
+	@TableLogic
+	private Integer delFlag;
 
 }
diff --git a/src/main/java/com/peanut/modules/master/controller/BuyConfigController.java b/src/main/java/com/peanut/modules/master/controller/BuyConfigController.java
index b52687bc..bce9b258 100644
--- a/src/main/java/com/peanut/modules/master/controller/BuyConfigController.java
+++ b/src/main/java/com/peanut/modules/master/controller/BuyConfigController.java
@@ -3,7 +3,9 @@ package com.peanut.modules.master.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.peanut.common.utils.R;
+import com.peanut.modules.book.service.BuyOrderService;
 import com.peanut.modules.common.entity.BookBuyConfigEntity;
+import com.peanut.modules.common.entity.BuyOrder;
 import com.peanut.modules.common.entity.VipBuyConfigEntity;
 import com.peanut.modules.master.service.BookBuyConfigService;
 import com.peanut.modules.master.service.VipBuyConfigService;
@@ -27,6 +29,8 @@ public class BuyConfigController {
     private BookBuyConfigService bookBuyConfigService;
     @Autowired
     private VipBuyConfigService vipBuyConfigService;
+    @Autowired
+    private BuyOrderService buyOrderService;
 
     @RequestMapping("/getBookBuyConfigList")
     public R getBookBuyConfigList(@RequestBody Map<String, Object> params) {
@@ -55,6 +59,12 @@ public class BuyConfigController {
 
     @RequestMapping("/delBookBuyConfig")
     public R delBookBuyConfig(@RequestBody Map<String, Object> params) {
+        int count = buyOrderService.count(new LambdaQueryWrapper<BuyOrder>()
+                .eq(BuyOrder::getOrderStatus,3)
+                .eq(BuyOrder::getProductId,params.get("id").toString()));
+        if (count > 0) {
+            return R.error("已有用户充值");
+        }
         bookBuyConfigService.removeById(params.get("id").toString());
         return R.ok();
     }