修改bug

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/CommercialController.java

@@ -58,8 +58,8 @@ public class CommercialController {
     @SaCheckPermission("szzs:commerce:delete")
     @DeleteMapping("/deleteCommercial")
     public R deleteCommercial(@NotEmpty(message = "待删除商户Id不能为空") String[] commercialIds){
-        String s = commericalService.deleteCommercial(commercialIds);
-        return R.ok(s);
+        R r = commericalService.deleteCommercial(commercialIds);
+        return r;
     }
 
     /**

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/EquipmentController.java

@@ -94,8 +94,8 @@ public class EquipmentController {
     @SaCheckPermission("szzs:equipment:delete")
     @DeleteMapping("/deleteEquipment")
     public R deleteEquipment(@NotEmpty String[] equipmentIds){
-        String s = equipmentService.deleteEquipment(equipmentIds);
-        return R.ok(s);
+        R r = equipmentService.deleteEquipment(equipmentIds);
+        return r;
     }
 
     /**

ruoyi-demo/src/main/java/com/ruoyi/demo/service/CommericalService.java

@@ -11,7 +11,7 @@ import java.util.List;
 public interface CommericalService {
     void addCommercial(CommercialVo commercialVo);
 
-    String deleteCommercial(String[] commercialIds);
+    R deleteCommercial(String[] commercialIds);
 
     Commercial getCommercial(String commercialId);
 

ruoyi-demo/src/main/java/com/ruoyi/demo/service/EquipmentService.java

@@ -21,7 +21,7 @@ public interface EquipmentService {
 
     EquipmentBo getEquipment(String equipmentId);
 
-    String deleteEquipment(String[] equipmentIds);
+    R deleteEquipment(String[] equipmentIds);
 
     Page<Equipment> getEquipmentBySelect(EquipmentVo equipmentVo);
 

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/CommercialServiceImpl.java

@@ -1,13 +1,10 @@
 package com.ruoyi.demo.service.impl;
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.demo.entity.App;
 import com.ruoyi.demo.entity.Commercial;
 import com.ruoyi.demo.entity.Plan;
@@ -23,14 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.validation.constraints.NotBlank;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 @Transactional
@@ -64,15 +57,15 @@ public class CommercialServiceImpl implements CommericalService {
      * @return
      */
     @Override
-    public String deleteCommercial(String[] commercialIds) {
+    public R deleteCommercial(String[] commercialIds) {
         //1.判断旗下是否有小程序
         QueryWrapper<App> queryWrapper = new QueryWrapper<>();
         queryWrapper.in("commercial_id",commercialIds);
         Long aLong = appMapper.selectCount(queryWrapper);
         if (aLong != 0L)
-            return "待删除的商户中存在App";
+            return R.fail("待删除的商户中存在App");
         commercialMapper.deleteBatchIds(Arrays.asList(commercialIds));
-        return "删除成功";
+        return R.ok("删除成功");
     }
 
     /**

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/EquipmentServiceImpl.java

@@ -191,7 +191,7 @@ public class EquipmentServiceImpl implements EquipmentService {
      * @return
      */
     @Override
-    public String deleteEquipment(String[] equipmentIds) {
+    public R deleteEquipment(String[] equipmentIds) {
         //1.查询设备下身份有广告
         QueryWrapper<PlanItemBo> queryWrapper = new QueryWrapper<>();
         queryWrapper.in("equipment_id",equipmentIds);
@@ -203,9 +203,9 @@ public class EquipmentServiceImpl implements EquipmentService {
         });
         Integer count = planItemMapper.getEuipmentPlanCont(queryWrapper);
         if (count > 0)
-            return "设备下存在广告计划，请移除广告后在删除设备";
+            return R.fail("设备下存在广告计划，请移除广告后在删除设备");
         equipmentMapper.deleteBatchIds(Arrays.asList(equipmentIds));
-        return "移除成功";
+        return R.ok("移除成功");
     }