From 6311049f76909d6980e50e8877385eadbcaadec0 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 7 Apr 2025 18:04:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=99=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/canteen/core/account/domain/AccInfoVo.java | 7 ------- .../canteen/core/account/mapper/AccInfoMapper.java | 2 +- .../core/account/service/IAccInfoService.java | 2 +- .../account/service/impl/AccInfoServiceImpl.java | 10 +++++----- .../main/resources/mapper/account/AccInfoMapper.xml | 12 +----------- 5 files changed, 8 insertions(+), 25 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccInfoVo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccInfoVo.java index d44f589..fcd1e5b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccInfoVo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccInfoVo.java @@ -12,17 +12,10 @@ public class AccInfoVo { @Excel(name = "账户id") @ApiModelProperty(value = "账户id") private Long accId; - - /** 账户名称 */ - @Excel(name = "账户名称") - @ApiModelProperty(value = "账户名称") - private String accName; - /** 人员id */ @Excel(name = "人员id") @ApiModelProperty(value = "人员id") private Long userId; - @ApiModelProperty("账户状态 1正常 2冻结 3销户 4过期") private Integer accStatus; @ApiModelProperty("账户可用总余额(不包括冻结金额)") 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 4e9cbbd..b00c82e 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 @@ -27,7 +27,7 @@ public interface AccInfoMapper { */ public List selectAccInfoList(AccInfo accInfo); - public List selectAccInfoVoList(AccInfo accInfo); + public AccInfoVo selectAccInfoVo(AccInfo accInfo); /** * 新增账户资料 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 846a6d9..38f2671 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 @@ -29,7 +29,7 @@ public interface IAccInfoService { */ public List selectAccInfoList(AccInfo accInfo); - public List selectAccInfoVoList(AccInfo accInfo); +// public List selectAccInfoVoList(AccInfo accInfo); /** * 新增账户资料 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 7fb7d9c..78cf88a 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 @@ -67,10 +67,10 @@ public class AccInfoServiceImpl implements IAccInfoService { return accInfoMapper.selectAccInfoList(accInfo); } - @Override - public List selectAccInfoVoList(AccInfo accInfo) { - return accInfoMapper.selectAccInfoVoList(accInfo); - } +// @Override +// public List selectAccInfoVoList(AccInfo accInfo) { +// return accInfoMapper.selectAccInfoVoList(accInfo); +// } /** * 新增账户资料 @@ -167,7 +167,7 @@ public class AccInfoServiceImpl implements IAccInfoService { public WalletBalanceVO queryWalletBalance(AccInfo accInfo) { log.info("[app]v4查询账户余额入参={}", JSONUtil.toJsonStr(accInfo)); - AccInfoVo accInfoVO = (AccInfoVo) accInfoMapper.selectAccInfoVoList(accInfo); + AccInfoVo accInfoVO = accInfoMapper.selectAccInfoVo(accInfo); if (ObjectUtil.isNull(accInfoVO)) { throw new ServiceException("账户不存在"); } else { 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 359fbf0..7b8d738 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 @@ -59,16 +59,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - - - - - select acc_id, acc_name, user_id, wallet_bal, subsidy_bal, red_envelope, subsidy_freeze_bal, acc_bal, balance2, water_wallet_bal, water_subsidy_bal, freeze_wallet_bal, freeze_subsidy_bal, @@ -137,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and acc_id = #{accId}