From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantServiceImpl.java
index 45bdfc9..37dc7af 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantServiceImpl.java
@@ -12,6 +12,7 @@
import com.panzhihua.service_community.entity.VolunteerActivity;
import com.panzhihua.service_community.entity.VolunteerMerchant;
import com.panzhihua.service_community.entity.VolunteerType;
+import com.panzhihua.service_community.service.VolunteerIntegralMerchantService;
import com.panzhihua.service_community.service.VolunteerMerchantService;
import com.panzhihua.service_community.service.VolunteerTypeService;
import lombok.extern.slf4j.Slf4j;
@@ -27,6 +28,10 @@
{
@Resource
private VolunteerMerchantService vmService;
+
+
+ @Resource
+ private VolunteerIntegralMerchantService vimService;
@Override
public R getById(String id) {
@@ -155,13 +160,22 @@
}
@Override
- public R deleteVolunteerMerchant(String id) {
+ public R deleteVolunteerMerchant(String id)
+ {
+
+ int goodNum=vimService.getNum(id);
+
+ if(goodNum>0)
+ {
+ return R.fail("请下架所有商铺商品");
+ }
+
int num= baseMapper.delete(id);
if(num>0)
{
return R.ok();
}
- return R.fail("添加失败");
+ return R.fail("失败");
}
@Override
--
Gitblit v1.7.1