From c25bca7d8636ce966172e262ba2f80d2606f7ef7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 03 九月 2025 20:19:04 +0800
Subject: [PATCH] 加盟商设置是否隐藏
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
index df00a10..3ccb91e 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
@@ -13,6 +13,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.admin.api.entity.FranchiseeVO;
import com.ruoyi.admin.config.WeChatConfig;
import com.ruoyi.admin.entity.*;
import com.ruoyi.admin.service.*;
@@ -49,9 +50,11 @@
import lombok.Getter;
import org.apache.commons.codec.CharEncoding;
import org.apache.poi.util.IOUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -877,6 +880,13 @@
MasterWorker byId = masterWorkerService.getById(id);
return R.ok(byId.getProfilePicture());
}
+ @GetMapping(value = "/getFranchiseeInfo")
+ public R<FranchiseeVO> getFranchiseeInfo(@RequestParam("franchiseeId") Integer franchiseeId) {
+ Franchisee franchisee = franchiseeService.getById(franchiseeId);
+ FranchiseeVO franchiseeVO = new FranchiseeVO();
+ BeanUtils.copyProperties(franchisee, franchiseeVO);
+ return R.ok(franchiseeVO);
+ }
/**
* 新增加盟商信息
@@ -907,6 +917,11 @@
.eq(SysUser::getIsEnable, 1).eq(SysUser::getIsDelete, 0).list();
if(!list1.isEmpty()){
return R.passwordError("该管理员账号已存在！");
+ }
+ // 设置加盟商初始密码
+ List<Franchisee> franchiseeList = franchiseeService.list();
+ if (!CollectionUtils.isEmpty(franchiseeList)){
+ franchisee.setPayPassword(franchiseeList.get(0).getPayPassword());
}
boolean save = franchiseeService.save(franchisee);
// 生成sysUser账号
@@ -1104,5 +1119,18 @@
return R.ok();
}
+ /**
+ * 设置加盟商是否显示司机信息
+ *
+ */
+ @ApiOperation(value = "加盟商设置是否显示【202509】",notes = "id:加盟商id,isDisplay:是否显示 1=是 0=否", tags = {"后台-加盟商管理"})
+ @PutMapping(value = "/setIsDisplay")
+ public R<String> setIsDisplay(@RequestParam(value = "id") Integer id,
+ @RequestParam(value = "isDisplay") Integer isDisplay) {
+ Franchisee franchisee = franchiseeService.getById(id);
+ franchisee.setIsDisplay(isDisplay);
+ franchiseeService.updateById(franchisee);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1