From 0e811d713a6a3606944d9022603303674216a878 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 03 九月 2025 20:54:05 +0800
Subject: [PATCH] 加盟商设置是否隐藏
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 27 ++++++++-------------------
1 files changed, 8 insertions(+), 19 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 3ccb91e..2730d6c 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
@@ -11,14 +11,13 @@
import com.alipay.api.AlipayApiException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.*;
import com.ruoyi.admin.utils.MD5AndKL;
-import com.ruoyi.admin.utils.WeChatUtil;
import com.ruoyi.admin.utils.util.CreateLinkStringByGet1;
import com.ruoyi.admin.utils.util.HttpRequester;
import com.ruoyi.admin.utils.util.HttpRespons;
@@ -30,18 +29,12 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.common.security.utils.SecurityUtils;
import com.wechat.pay.contrib.apache.httpclient.auth.PrivateKeySigner;
import com.wechat.pay.contrib.apache.httpclient.util.PemUtil;
import com.wechat.pay.java.core.exception.MalformedMessageException;
import com.wechat.pay.java.core.exception.ServiceException;
import com.wechat.pay.java.core.notification.NotificationParser;
-import com.wechat.pay.java.service.partnerpayments.app.model.Transaction;
-import com.wechat.pay.java.service.payments.jsapi.model.Amount;
import com.wechat.pay.java.service.payments.jsapi.JsapiService;
-import com.wechat.pay.java.service.payments.jsapi.model.Payer;
-import com. wechat. pay. java. service. payments. jsapi. model. PrepayRequest;
-import com.wechat.pay.java.service.payments.jsapi.model.PrepayResponse;
import com.wechat.pay.java.service.payments.nativepay.NativePayService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -50,8 +43,6 @@
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;
@@ -64,14 +55,12 @@
import java.io.*;
import java.math.BigDecimal;
import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
import java.security.PrivateKey;
import java.security.SecureRandom;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
/**
@@ -880,13 +869,6 @@
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);
- }
/**
* 新增加盟商信息
@@ -1130,6 +1112,13 @@
Franchisee franchisee = franchiseeService.getById(id);
franchisee.setIsDisplay(isDisplay);
franchiseeService.updateById(franchisee);
+ // 查询用户信息
+ SysUser sysUser = sysUserService.getOne(Wrappers.lambdaQuery(SysUser.class)
+ .eq(SysUser::getFranchiseeId, id));
+ if (Objects.nonNull(sysUser)) {
+ sysUser.setIsDisplay(isDisplay);
+ sysUserService.updateById(sysUser);
+ }
return R.ok();
}
--
Gitblit v1.7.1