修改租户时添加限制、租户删除接口修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -21,6 +21,10 @@ import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StreamUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.pay.domain.bo.PaySubInfoBo;
+import com.ruoyi.pay.domain.vo.PaySubInfoVo;
+import com.ruoyi.pay.service.IPaySubInfoService;
+import com.ruoyi.pay.service.IPayTenantService;
 import com.ruoyi.system.domain.vo.SysUserExportVo;
 import com.ruoyi.system.domain.vo.SysUserImportVo;
 import com.ruoyi.system.listener.SysUserImportListener;
@@ -30,15 +34,15 @@ import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
+import javax.validation.constraints.NotEmpty;
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
+import java.util.stream.Collectors;
-import java.util.Map;
 
 /**
  * 用户管理
@@ -55,7 +59,8 @@ public class SysUserController extends BaseController {
     private final ISysRoleService roleService;
     private final ISysPostService postService;
     private final ISysDeptService deptService;
-
+    private final IPaySubInfoService subInfoService;
+    private final IPayTenantService iPayTenantService;
 
     /**
      * 获取用户列表
@@ -259,14 +264,14 @@ public class SysUserController extends BaseController {
     }
 
     /**
-     * 删除公司信息
+     * 删除租户信息
      *
      * @param ids 主键串
      */
-/*    @SaCheckPermission("aftersale:company:remove")
+    @SaCheckPermission("pay:tenant:remove")
-    @Log(title = "公司信息", businessType = BusinessType.DELETE)
+    @Log(title = "租户信息", businessType = BusinessType.DELETE)
     @Transactional
-    @DeleteMapping("/company/{ids}")
+    @DeleteMapping("/tenant/{ids}")
     public R<Void> delete(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
         for(Long id:ids){
@@ -288,14 +293,14 @@ public class SysUserController extends BaseController {
                 roleService.deleteRoleByIds(rids.toArray(rids.toArray(new Long[rids.size()])));
             }
             //删除公司订阅信息
-            AsSubscriptionInfoBo subInfo=new AsSubscriptionInfoBo();
+            PaySubInfoBo subInfo=new PaySubInfoBo();
             subInfo.setTenantId(id);
-            List<AsSubscriptionInfoVo> infoVos = iAsSubscriptionInfoService.queryList(subInfo);
+            List<PaySubInfoVo> infoVos = subInfoService.queryList(subInfo);
-            List<Long> sids = infoVos.stream().map(AsSubscriptionInfoVo::getId).collect(Collectors.toList());
+            List<Long> sids = infoVos.stream().map(PaySubInfoVo::getId).collect(Collectors.toList());
             if(sids!=null&&sids.size()>0){
-                iAsSubscriptionInfoService.deleteWithValidByIds(sids,true);
+                subInfoService.deleteWithValidByIds(sids,true);
+            }
         }
+        return toAjax(iPayTenantService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
-        return toAjax(iAsCompanyService.deleteWithValidByIds(Arrays.asList(ids), true));
-    }*/
 }

ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayTenantController.java

@@ -4,10 +4,14 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import com.ruoyi.pay.domain.bo.PaySubInfoBo;
+import com.ruoyi.pay.domain.vo.PaySubInfoVo;
+import com.ruoyi.pay.service.IPaySubInfoService;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -38,6 +42,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 public class PayTenantController extends BaseController {
 
     private final IPayTenantService iPayTenantService;
+    private final IPaySubInfoService subInfoService;
 
     /**
      * 查询租户列表
@@ -101,8 +106,25 @@ public class PayTenantController extends BaseController {
     @SaCheckPermission("pay:tenant:edit")
     @Log(title = "租户", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
+    @Transactional
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody PayTenantBo bo) {
+        //修改公司名要确保唯一性
+        PayTenantBo queryBo = new PayTenantBo();
+        queryBo.setName(bo.getName());
+        List<PayTenantVo> asCompany= iPayTenantService.queryList(queryBo);
+        if(asCompany!=null&&asCompany.size()>0&&!asCompany.get(0).getId().equals(bo.getId())){
+            return  new R().fail("修改失败，已有该公司名！");
+        }
+        //公司修改名称 同时修改订阅计划中的公司名称
+        PaySubInfoBo subInfo = new PaySubInfoBo();
+        subInfo.setTenantId(bo.getId());
+        List<PaySubInfoVo> asSubscriptionInfoVos = subInfoService.queryList(subInfo);
+        if(asSubscriptionInfoVos!=null&&asSubscriptionInfoVos.size()>0){
+            subInfo.setId(asSubscriptionInfoVos.get(0).getId());
+            subInfo.setCompanyName(bo.getName());
+            subInfoService.updateByBo(subInfo);
+        }
         return toAjax(iPayTenantService.updateByBo(bo));
     }