From 1c6c29484c68ce256366eb6747621b47269567a0 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 7 Apr 2025 16:24:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=BB=BA=E7=AB=8B=E8=B4=A6?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/controller/AccInfoController.java | 25 +++++++++++--- .../core/account/mapper/AccInfoMapper.java | 2 +- .../core/account/service/IAccInfoService.java | 6 ++-- .../service/impl/AccInfoServiceImpl.java | 33 ++++++++++++++----- .../mapper/account/AccInfoMapper.xml | 4 +-- 5 files changed, 53 insertions(+), 17 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccInfoController.java index dd28856..bc9ab35 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccInfoController.java @@ -3,21 +3,17 @@ package com.bonus.canteen.core.account.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; import com.bonus.common.log.enums.OperaType; -import com.bonus.canteen.core.common.annotation.PreventRepeatSubmit; import com.bonus.system.api.domain.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.bonus.common.log.annotation.SysLog; -import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.canteen.core.account.domain.AccInfo; import com.bonus.canteen.core.account.service.IAccInfoService; import com.bonus.common.core.web.controller.BaseController; @@ -133,4 +129,25 @@ public class AccInfoController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(accInfoService.deleteAccInfoByIds(ids)); } + + /** + * 删除账户资料 + */ +// @ApiOperation(value = "删除账户资料") +// //@PreventRepeatSubmit +// //@RequiresPermissions("account:info:remove") +// @SysLog(title = "账户资料", businessType = OperaType.DELETE, logType = 1,module = "账户管理->删除账户资料") +// @PostMapping("/delete/{userIds}") +// public AjaxResult deleteAccInfoByUserIds(@PathVariable("userIds") Long[] userIds) { +// return toAjax(accInfoService.deleteAccInfoByUserIds(userIds)); +// } + + @ApiOperation(value = "删除账户资料") + //@PreventRepeatSubmit + //@RequiresPermissions("account:info:remove") + @SysLog(title = "账户资料", businessType = OperaType.DELETE, logType = 1,module = "账户管理->删除账户资料") + @PostMapping("/deleteAccInfoByUserIds") + public AjaxResult deleteAccInfoByUserIds(@RequestBody List users) { + return toAjax(accInfoService.deleteAccInfoByUserIds(users)); + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccInfoMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccInfoMapper.java index 0255a9a..64b76c0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccInfoMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccInfoMapper.java @@ -48,7 +48,7 @@ public interface AccInfoMapper { * @param id 账户资料主键 * @return 结果 */ - public int deleteAccInfoById(Long id); + public int deleteAccInfoByUserId(Long id); /** * 批量删除账户资料 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/IAccInfoService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/IAccInfoService.java index 7095f9b..30e4095 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/IAccInfoService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/IAccInfoService.java @@ -54,10 +54,12 @@ public interface IAccInfoService { /** * 删除账户资料信息 * - * @param id 账户资料主键 + * @param userIds 账户资料主键 * @return 结果 */ - public int deleteAccInfoById(Long id); + public int deleteAccInfoByUserIds(Long[] userIds); + + public int deleteAccInfoByUserIds(List users); public int syncAccInfo(SysUser sysUser); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java index a910fc6..4f520bc 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java @@ -1,7 +1,6 @@ package com.bonus.canteen.core.account.service.impl; import java.util.ArrayList; -import java.util.Date; import java.util.List; import com.bonus.canteen.core.account.domain.AccWalletInfo; @@ -10,9 +9,6 @@ import com.bonus.canteen.core.account.enums.AccWalletIdEnum; import com.bonus.canteen.core.account.service.IAccWalletInfoService; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; -import com.bonus.common.houqin.mq.constant.LeMqConstant; -import com.bonus.common.houqin.mq.util.MqUtil; -import com.bonus.common.houqin.utils.id.Id; import com.bonus.system.api.domain.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -102,12 +98,33 @@ public class AccInfoServiceImpl implements IAccInfoService { /** * 删除账户资料信息 * - * @param id 账户资料主键 + * @param userIds 账户资料主键 * @return 结果 */ - @Override - public int deleteAccInfoById(Long id) { - return accInfoMapper.deleteAccInfoById(id); + @Transactional( + rollbackFor = {Exception.class} + ) + public int deleteAccInfoByUserIds(Long[] userIds) { + int count = 0; + for (int i = 0; i < userIds.length; i++) { + accWalletInfoService.deleteAccWalletInfoByUserId(userIds[i]); + //MqUtil.sendDataChange(userId, LeMqConstant.DataChangeType.REMOVE, LeMqConstant.Topic.DATA_CHANGE_CUSTOMER); + count += accInfoMapper.deleteAccInfoByUserId(userIds[i]); + } + return count; + } + + @Transactional( + rollbackFor = {Exception.class} + ) + public int deleteAccInfoByUserIds(List users) { + int count = 0; + for (int i = 0; i < users.size(); i++) { + accWalletInfoService.deleteAccWalletInfoByUserId(users.get(i).getUserId()); + //MqUtil.sendDataChange(userId, LeMqConstant.DataChangeType.REMOVE, LeMqConstant.Topic.DATA_CHANGE_CUSTOMER); + count += accInfoMapper.deleteAccInfoByUserId(users.get(i).getUserId()); + } + return count; } @Transactional( diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml index d280e48..4bd8eac 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml @@ -296,8 +296,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - - delete from acc_info where id = #{id} + + delete from acc_info where user_id = #{userId}