From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryStoreClassServiceImpl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryStoreClassServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryStoreClassServiceImpl.java
index 7361e97..9bd0c9a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryStoreClassServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryStoreClassServiceImpl.java
@@ -1,8 +1,10 @@
package com.panzhihua.service_community.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.panzhihua.common.model.vos.common.ComBatteryCommodityVo;
import com.panzhihua.common.model.vos.common.ComBatteryStoreClassVo;
import com.panzhihua.service_community.dao.ComBatteryCommodityMapper;
+import com.panzhihua.service_community.entity.ComBatteryCommodity;
import com.panzhihua.service_community.entity.ComBatteryStoreClass;
import com.panzhihua.service_community.dao.ComBatteryStoreClassMapper;
import com.panzhihua.service_community.service.ComBatteryStoreClassService;
@@ -94,6 +96,11 @@
*/
@Override
public R deleteById(Long id) {
+ Integer count = commodityMapper.selectCount(new QueryWrapper<ComBatteryCommodity>().lambda()
+ .eq(ComBatteryCommodity::getClassId,id).eq(ComBatteryCommodity::getIsDel,ComBatteryCommodity.IsDel.NO));
+ if(count > 0){
+ return R.fail("该分类下已绑定商品，不可删除");
+ }
if (this.baseMapper.deleteById(id) > 0) {
return R.ok();
}
--
Gitblit v1.7.1