From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantServiceImpl.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 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..4addeaf 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,7 +160,16 @@
     }
 
     @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)
         {

--
Gitblit v1.7.1