From 9f69747bd17d9c05f1db0852957737b5b8677742 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 16 Aug 2022 17:55:32 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98-=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E5=92=8C?= =?UTF-8?q?=E5=81=9C=E7=94=A8=E5=90=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/22年7月变更.sql | 2 + .../CompanyManagerLoginController.java | 3 ++ .../PayManagerManagementController.java | 53 ++++++++++++++++++- .../company/entity/PayManagerManagement.java | 7 +++ 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/db/22年7月变更.sql b/db/22年7月变更.sql index 8e67a210..98b6ee21 100644 --- a/db/22年7月变更.sql +++ b/db/22年7月变更.sql @@ -109,3 +109,5 @@ INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `co INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1554373328009789441', '1554351144621146113', '编辑', NULL, NULL, NULL, NULL, 2, 'companyadmin:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-08-02 15:47:35', NULL, NULL, 0, 0, '1', 0); INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1554373257453207554', '1554351144621146113', '新增', NULL, NULL, NULL, NULL, 2, 'companyadmin:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-08-02 15:47:18', NULL, NULL, 0, 0, '1', 0); INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1554351144621146113', '1430376218661572609', '企业管理员', '/businessManagement/CompanyAdmin', 'businessManagement/CompanyAdmin', NULL, NULL, 1, NULL, '1', 3.00, 0, NULL, 1, 0, 0, 0, NULL, 'LKGLZ', '2022-08-02 14:19:26', NULL, NULL, 0, 0, '1', 0); +ALTER TABLE `pay_manager_management` + ADD COLUMN `status` tinyint(1) NULL DEFAULT NULL COMMENT '状态(1-正常,2-冻结)' ; \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyManagerLoginController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyManagerLoginController.java index 2101a48e..44147ddd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyManagerLoginController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyManagerLoginController.java @@ -300,6 +300,9 @@ public class CompanyManagerLoginController { * 用户信息 */ private void userInfo(PayManagerManagement managerManagement, Result result) { + if (Objects.equals(managerManagement.getStatus(),2)) { + throw new JeroBootException("用户已停用"); + } String syspassword = managerManagement.getPassword(); String phone = managerManagement.getPhone(); managerManagement.setPhone(PasswordUtil.decrypt(phone)); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java index 7ca9cece..c2e51527 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java @@ -8,8 +8,10 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; @@ -25,9 +27,11 @@ import com.jero.company.service.IPayManagerManagementService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.system.entity.SysUser; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -57,6 +61,7 @@ public class PayManagerManagementController extends JeroController queryPageList(PayManagerManagement payManagerManagement, @@ -85,6 +90,7 @@ public class PayManagerManagementController extends JeroController frozenBatch(@RequestBody JSONObject jsonObject) { + try { + String ids = jsonObject.getString("ids"); + String status = jsonObject.getString("status"); + String[] arr = ids.split(","); + for (String id : arr) { + if(oConvertUtils.isNotEmpty(id)) { + payManagerManagementService.update(new PayManagerManagement().setStatus(Integer.parseInt(status)), + new UpdateWrapper().lambda().eq(PayManagerManagement::getId,id)); + } + } + } catch (Exception e) { + log.error(e.getMessage(), e); + Result.error("操作失败"+e.getMessage()); + } + return Result.OK(); + + } + + /** + * 重置密码 + */ + @RequiresPermissions("companyadmin:resetPassword") + @PostMapping(value = "/resetPassword") + public Result resetPassword(@RequestBody PayManagerManagement payManagerManagement) { + String id = payManagerManagement.getId(); + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(PayManagerManagement::getId,id); + wrapper.set(PayManagerManagement::getSalt,null); + wrapper.set(PayManagerManagement::getPassword,null); + payManagerManagementService.update(wrapper); + return Result.OK(); + } + /** * 导出excel */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayManagerManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayManagerManagement.java index bc840d37..42259bc0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayManagerManagement.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayManagerManagement.java @@ -171,6 +171,13 @@ public class PayManagerManagement implements Serializable { @ApiModelProperty(value = "会员企业id") private String memberId; + /** + * 状态(1：正常 2：冻结 ） + */ + @Excel(name = "状态", width = 15,dicCode = "user_status") + @Dict(dicCode = "user_status") + private Integer status; + /**企业角色1:普通企业、2：会员企业*/ @TableField(exist = false) @ApiModelProperty(value = "企业角色1:普通企业、2：会员企业")