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 params) { @@ -55,6 +59,12 @@ public class BuyConfigController { @RequestMapping("/delBookBuyConfig") public R delBookBuyConfig(@RequestBody Map params) { + int count = buyOrderService.count(new LambdaQueryWrapper() + .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(); }