From 0f01e02acf12c51e1d2eec40ea7220897ef22b29 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Mon, 26 May 2025 17:14:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/controller/AccInfoController.java | 10 ++--- .../domain/{AccInfo.java => AccountInfo.java} | 2 +- .../account/domain/bo/AccountInfoHistory.java | 34 +++++++++++++++++ .../param/AccountEnableDisableParam.java | 2 +- .../AccountInfoHistoryVO.java} | 5 ++- .../core/account/mapper/AccInfoMapper.java | 20 +++++----- .../mapper/AccOperationHistoryMapper.java | 9 +++-- .../service/AccOperationHistoryService.java | 5 ++- .../core/account/service/IAccInfoService.java | 10 ++--- .../service/impl/AccCardServiceImpl.java | 22 +++++------ .../service/impl/AccInfoServiceImpl.java | 38 +++++++++---------- .../impl/AccOperationHistoryServiceImpl.java | 17 ++++----- .../mapper/account/AccInfoMapper.xml | 10 ++--- .../account/AccOperationHistoryMapper.xml | 2 +- 14 files changed, 111 insertions(+), 75 deletions(-) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/{AccInfo.java => AccountInfo.java} (99%) create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/bo/AccountInfoHistory.java rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/{bo/AccOperationHistory.java => vo/AccountInfoHistoryVO.java} (92%) 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 264e9c9..993302d 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 @@ -1,6 +1,6 @@ package com.bonus.canteen.core.account.controller; -import com.bonus.canteen.core.account.domain.AccInfo; +import com.bonus.canteen.core.account.domain.AccountInfo; import com.bonus.canteen.core.account.domain.param.*; import com.bonus.canteen.core.account.domain.vo.AccInfoDetailsVO; import com.bonus.canteen.core.account.service.AccOperationHistoryService; @@ -82,9 +82,9 @@ public class AccInfoController extends BaseController { //@RequiresPermissions("account:info:add") @SysLog(title = "账户资料", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增账户资料") @PostMapping - public AjaxResult add(@RequestBody AccInfo accInfo) { + public AjaxResult add(@RequestBody AccountInfo accountInfo) { try { - return toAjax(accInfoService.insertAccInfo(accInfo)); + return toAjax(accInfoService.insertAccInfo(accountInfo)); } catch (Exception e) { return error("系统错误, " + e.getMessage()); } @@ -179,8 +179,8 @@ public class AccInfoController extends BaseController { notes = "移动端查询账户(仅返回钱包余额)" ) @PostMapping({"/wallet/balance"}) - public AjaxResult queryWalletBalance(@RequestBody AccInfo accInfo) { - return success(this.accInfoService.queryWalletBalance(accInfo)); + public AjaxResult queryWalletBalance(@RequestBody AccountInfo accountInfo) { + return success(this.accInfoService.queryWalletBalance(accountInfo)); } @ApiOperation("单人充值") @PostMapping("/recharge") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccountInfo.java similarity index 99% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccInfo.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccountInfo.java index 9187982..14fbe68 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccInfo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccountInfo.java @@ -21,7 +21,7 @@ import java.util.Date; @Data @ToString -public class AccInfo extends BaseEntity { +public class AccountInfo extends BaseEntity { private static final long serialVersionUID = 1L; /** 账户id 主键自增 */ diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/bo/AccountInfoHistory.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/bo/AccountInfoHistory.java new file mode 100644 index 0000000..9e04810 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/bo/AccountInfoHistory.java @@ -0,0 +1,34 @@ +package com.bonus.canteen.core.account.domain.bo; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.bonus.common.core.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; +@Data +public class AccountInfoHistory { + /** 主键id */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** 账户id */ + @ApiModelProperty(value = "账户id") + private Long accountId; + + /** 用户id */ + @ApiModelProperty(value = "用户id") + private Long userId; + + /** 操作人员用户名 */ + @ApiModelProperty(value = "操作人员用户名") + private String operateUserName; + + /** 操作类型1-冻结2-解冻3-挂失4-解挂 */ + @ApiModelProperty(value = "操作类型1-冻结2-解冻3-挂失4-解挂") + private Integer operationType; + + private String createBy; +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccountEnableDisableParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccountEnableDisableParam.java index 9dab3be..27f0051 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccountEnableDisableParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccountEnableDisableParam.java @@ -8,5 +8,5 @@ public class AccountEnableDisableParam { @ApiModelProperty(value = "人员id") private Long userId; @ApiModelProperty(value = "账户状态 0正常 1停用") - private Long accStatus; + private Long accountStatus; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/bo/AccOperationHistory.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccountInfoHistoryVO.java similarity index 92% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/bo/AccOperationHistory.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccountInfoHistoryVO.java index 4009d42..d7aa90c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/bo/AccOperationHistory.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccountInfoHistoryVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.account.domain.bo; +package com.bonus.canteen.core.account.domain.vo; import com.alibaba.fastjson.annotation.JSONField; import com.bonus.common.core.annotation.Excel; @@ -6,8 +6,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDateTime; + @Data -public class AccOperationHistory { +public class AccountInfoHistoryVO { @ApiModelProperty("主键") private Integer id; @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 e905963..e6edad9 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 @@ -1,7 +1,7 @@ package com.bonus.canteen.core.account.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bonus.canteen.core.account.domain.AccInfo; +import com.bonus.canteen.core.account.domain.AccountInfo; import com.bonus.canteen.core.account.domain.AccInfoVo; import com.bonus.canteen.core.account.domain.param.AccountInfoQueryParam; import com.bonus.canteen.core.account.domain.vo.AccInfoDetailsVO; @@ -17,40 +17,40 @@ import java.util.List; * @author xsheng * @date 2025-04-05 */ -public interface AccInfoMapper extends BaseMapper { +public interface AccInfoMapper extends BaseMapper { /** * 查询账户资料 * * @param accId 账户资料主键 * @return 账户资料 */ - public AccInfo selectAccInfoById(@Param("accId") Long accId); + public AccountInfo selectAccInfoById(@Param("accId") Long accId); /** * 查询账户资料列表 * - * @param accInfo 账户资料 + * @param accountInfo 账户资料 * @return 账户资料集合 */ - public List selectAccInfoList(AccInfo accInfo); + public List selectAccInfoList(AccountInfo accountInfo); - public AccInfoVo selectAccInfoVo(AccInfo accInfo); + public AccInfoVo selectAccInfoVo(AccountInfo accountInfo); /** * 新增账户资料 * - * @param accInfo 账户资料 + * @param accountInfo 账户资料 * @return 结果 */ - public int insertAccInfo(AccInfo accInfo); + public int insertAccInfo(AccountInfo accountInfo); /** * 修改账户资料 * - * @param accInfo 账户资料 + * @param accountInfo 账户资料 * @return 结果 */ - public int updateAccInfo(AccInfo accInfo); + public int updateAccInfo(AccountInfo accountInfo); /** * 删除账户资料 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccOperationHistoryMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccOperationHistoryMapper.java index 3590dec..ce07e85 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccOperationHistoryMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccOperationHistoryMapper.java @@ -1,15 +1,16 @@ package com.bonus.canteen.core.account.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bonus.canteen.core.account.domain.bo.AccOperationHistory; +import com.bonus.canteen.core.account.domain.bo.AccountInfoHistory; import com.bonus.canteen.core.account.domain.param.AccOperationQueryParam; +import com.bonus.canteen.core.account.domain.vo.AccountInfoHistoryVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface AccOperationHistoryMapper extends BaseMapper { - List queryPageAccOperationRecord(@Param("param") AccOperationQueryParam param, - @Param("encryptedSearchValue") String encryptedSearchValue); +public interface AccOperationHistoryMapper extends BaseMapper { + List queryPageAccOperationRecord(@Param("param") AccOperationQueryParam param, + @Param("encryptedSearchValue") String encryptedSearchValue); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/AccOperationHistoryService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/AccOperationHistoryService.java index e319056..0a423a4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/AccOperationHistoryService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/AccOperationHistoryService.java @@ -1,12 +1,13 @@ package com.bonus.canteen.core.account.service; -import com.bonus.canteen.core.account.domain.bo.AccOperationHistory; +import com.bonus.canteen.core.account.domain.bo.AccountInfoHistory; import com.bonus.canteen.core.account.domain.param.AccOperationQueryParam; +import com.bonus.canteen.core.account.domain.vo.AccountInfoHistoryVO; import java.util.List; public interface AccOperationHistoryService { - List selectAccOperationHistory(AccOperationQueryParam param); + List selectAccOperationHistory(AccOperationQueryParam param); void addAccOperationHistory(Long userId, Integer type); } 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 a915b4e..8760647 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 @@ -1,6 +1,6 @@ package com.bonus.canteen.core.account.service; -import com.bonus.canteen.core.account.domain.AccInfo; +import com.bonus.canteen.core.account.domain.AccountInfo; import com.bonus.canteen.core.account.domain.WalletBalanceVO; import com.bonus.canteen.core.account.domain.param.*; import com.bonus.canteen.core.account.domain.vo.AccInfoDetailsVO; @@ -23,7 +23,7 @@ public interface IAccInfoService { * @param id 账户资料主键 * @return 账户资料 */ - public AccInfo selectAccInfoById(Long id); + public AccountInfo selectAccInfoById(Long id); /** * 查询账户资料列表 @@ -37,10 +37,10 @@ public interface IAccInfoService { /** * 新增账户资料 * - * @param accInfo 账户资料 + * @param accountInfo 账户资料 * @return 结果 */ - public int insertAccInfo(AccInfo accInfo); + public int insertAccInfo(AccountInfo accountInfo); /** * 修改账户资料 @@ -66,7 +66,7 @@ public interface IAccInfoService { public String getOrderQRCode(); - public WalletBalanceVO queryWalletBalance(AccInfo accInfo); + public WalletBalanceVO queryWalletBalance(AccountInfo accountInfo); List queryAccInfoByUserIds(List userIds); AccInfoDetailsVO queryAccInfoByUserId(Long userId); void checkAccStatus(AccInfoDetailsVO accInfoVO); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardServiceImpl.java index 4d53989..063dd0c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardServiceImpl.java @@ -7,7 +7,7 @@ import com.bonus.canteen.core.account.constants.CardStatusEnum; import com.bonus.canteen.core.account.constants.CardTypeEnum; import com.bonus.canteen.core.account.domain.AccCard; import com.bonus.canteen.core.account.domain.AccCardHis; -import com.bonus.canteen.core.account.domain.AccInfo; +import com.bonus.canteen.core.account.domain.AccountInfo; import com.bonus.canteen.core.account.mapper.AccCardHisMapper; import com.bonus.canteen.core.account.mapper.AccCardMapper; import com.bonus.canteen.core.account.mapper.AccInfoMapper; @@ -68,13 +68,13 @@ public class AccCardServiceImpl implements IAccCardService { accCard.setCreateBy(SecurityUtils.getUsername()); accCard.setCreateTime(DateUtils.getNowDate()); try { - AccInfo accInfo = accInfoMapper.selectAccInfoById(accCard.getAccountId()); - checkAccInfoAndStatus(accInfo); - accCard.setUserId(accInfo.getUserId()); + AccountInfo accountInfo = accInfoMapper.selectAccInfoById(accCard.getAccountId()); + checkAccInfoAndStatus(accountInfo); + accCard.setUserId(accountInfo.getUserId()); accCard.setCardStatus(CardStatusEnum.NORMAL.getKey()); accCard.setCardType(CardTypeEnum.IC_CARD.getKey()); // 发卡前校验是否此用户已有卡, 已退卡、已过期的可以再发放 - int cardCountByUserId= accCardMapper.selectAccCardCountByUserId(accInfo.getUserId()); + int cardCountByUserId= accCardMapper.selectAccCardCountByUserId(accountInfo.getUserId()); if (cardCountByUserId > 0) { throw new ServiceException("此用户已有卡, 不能再次发放"); } @@ -110,10 +110,10 @@ public class AccCardServiceImpl implements IAccCardService { accCardHisMapper.insertAccCardHis(accCardHis); } - public void checkAccInfoAndStatus(AccInfo accInfoVO) { - if (ObjectUtil.isNull(accInfoVO)) { + public void checkAccInfoAndStatus(AccountInfo accountInfoVO) { + if (ObjectUtil.isNull(accountInfoVO)) { throw new ServiceException("账户不存在"); - } else if (AccStatusEnum.DEACTIVATE.getKey().equals(accInfoVO.getAccountStatus())) { + } else if (AccStatusEnum.DEACTIVATE.getKey().equals(accountInfoVO.getAccountStatus())) { throw new ServiceException("账户已停用"); } } @@ -134,10 +134,10 @@ public class AccCardServiceImpl implements IAccCardService { if (cardCountByCardSerialNum > 0) { throw new ServiceException("卡号已存在, 卡号不能重复"); } - AccInfo accInfo = accInfoMapper.selectAccInfoById(accCard.getAccountId()); - checkAccInfoAndStatus(accInfo); + AccountInfo accountInfo = accInfoMapper.selectAccInfoById(accCard.getAccountId()); + checkAccInfoAndStatus(accountInfo); int count = accCardMapper.updateAccCard(accCard); - accCard.setUserId(accInfo.getUserId()); + accCard.setUserId(accountInfo.getUserId()); if (CardRecordTypeEnum.CHANGE.getKey().equals(accCard.getOperationType())) { accCard.setCardStatus(CardStatusEnum.NORMAL.getKey()); saveAccCardChangeRecord(accCard); 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 81833f3..d13746c 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 @@ -85,7 +85,7 @@ public class AccInfoServiceImpl implements IAccInfoService { * @return 账户资料 */ @Override - public AccInfo selectAccInfoById(Long id) { + public AccountInfo selectAccInfoById(Long id) { return accInfoMapper.selectAccInfoById(id); } @@ -112,14 +112,14 @@ public class AccInfoServiceImpl implements IAccInfoService { /** * 新增账户资料 * - * @param accInfo 账户资料 + * @param accountInfo 账户资料 * @return 结果 */ @Override - public int insertAccInfo(AccInfo accInfo) { - accInfo.setCreateTime(DateUtils.getNowDate()); + public int insertAccInfo(AccountInfo accountInfo) { + accountInfo.setCreateTime(DateUtils.getNowDate()); try { - return accInfoMapper.insertAccInfo(accInfo); + return accInfoMapper.insertAccInfo(accountInfo); } catch (Exception e) { throw new ServiceException("错误信息描述"); } @@ -193,17 +193,17 @@ public class AccInfoServiceImpl implements IAccInfoService { rollbackFor = {Exception.class} ) public int syncAccInfo(SysUser sysUser) { - AccInfo accInfo = new AccInfo(); - accInfo.setAccountStatus(AccStatusEnum.NORMAL.getKey()); - accInfo.setUserId(sysUser.getUserId()); - accInfoMapper.insertAccInfo(accInfo); + AccountInfo accountInfo = new AccountInfo(); + accountInfo.setAccountStatus(AccStatusEnum.NORMAL.getKey()); + accountInfo.setUserId(sysUser.getUserId()); + accInfoMapper.insertAccInfo(accountInfo); List accWalletInfos = new ArrayList(); AccWalletTypeEnum[] accWalletTypeEnums = AccWalletTypeEnum.values(); for(int i = 0; i < accWalletTypeEnums.length; ++i) { AccWalletTypeEnum accWalletTypeEnum = accWalletTypeEnums[i]; AccWalletInfo accWalletInfo = new AccWalletInfo(); - accWalletInfo.setAccountId(accInfo.getAccountId()); + accWalletInfo.setAccountId(accountInfo.getAccountId()); accWalletInfo.setUserId(sysUser.getUserId()); accWalletInfo.setWalletType(accWalletTypeEnum.getKey()); accWalletInfos.add(accWalletInfo); @@ -314,13 +314,13 @@ public class AccInfoServiceImpl implements IAccInfoService { @Transactional(rollbackFor = {Exception.class}) public void editAccountStatus(AccountEnableDisableParam accountEnableDisableParam) { - int flag = accInfoMapper.update((((Wrappers.lambdaUpdate(AccInfo.class) - .set(AccInfo::getAccountStatus, accountEnableDisableParam.getAccStatus())) - .set(AccInfo::getUpdateBy, SecurityUtils.getUserId())) - .set(AccInfo::getUpdateTime, LocalDateTime.now())) - .eq(AccInfo::getUserId, accountEnableDisableParam.getUserId())); + int flag = accInfoMapper.update((((Wrappers.lambdaUpdate(AccountInfo.class) + .set(AccountInfo::getAccountStatus, accountEnableDisableParam.getAccountStatus())) + .set(AccountInfo::getUpdateBy, SecurityUtils.getUserId())) + .set(AccountInfo::getUpdateTime, LocalDateTime.now())) + .eq(AccountInfo::getUserId, accountEnableDisableParam.getUserId())); if (flag > 0) { - this.accOperationHistoryService.addAccOperationHistory(accountEnableDisableParam.getUserId(), accountEnableDisableParam.getAccStatus().intValue()); + this.accOperationHistoryService.addAccOperationHistory(accountEnableDisableParam.getUserId(), accountEnableDisableParam.getAccountStatus().intValue()); try { DeviceMqPersonalUpdateMessageDTO bean = new DeviceMqPersonalUpdateMessageDTO().setUpdatePerson(Math.toIntExact(accountEnableDisableParam.getUserId()),"update"); String jsonString = JacksonUtil.writeValueAsString(bean); @@ -333,9 +333,9 @@ public class AccInfoServiceImpl implements IAccInfoService { } - public WalletBalanceVO queryWalletBalance(AccInfo accInfo) { - log.info("查询账户余额入参={}", JSONUtil.toJsonStr(accInfo)); - AccInfoVo accInfoVO = accInfoMapper.selectAccInfoVo(accInfo); + public WalletBalanceVO queryWalletBalance(AccountInfo accountInfo) { + log.info("查询账户余额入参={}", JSONUtil.toJsonStr(accountInfo)); + AccInfoVo accInfoVO = accInfoMapper.selectAccInfoVo(accountInfo); if (ObjectUtil.isNull(accInfoVO)) { throw new ServiceException("账户不存在"); } else { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccOperationHistoryServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccOperationHistoryServiceImpl.java index 78b3290..9415bbb 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccOperationHistoryServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccOperationHistoryServiceImpl.java @@ -4,8 +4,9 @@ import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bonus.canteen.core.account.domain.bo.AccOperationHistory; +import com.bonus.canteen.core.account.domain.bo.AccountInfoHistory; import com.bonus.canteen.core.account.domain.param.AccOperationQueryParam; +import com.bonus.canteen.core.account.domain.vo.AccountInfoHistoryVO; import com.bonus.canteen.core.account.mapper.AccOperationHistoryMapper; import com.bonus.canteen.core.account.service.AccOperationHistoryService; import com.bonus.common.core.constant.SecurityConstants; @@ -22,14 +23,14 @@ import java.util.List; import java.util.Objects; @Service -public class AccOperationHistoryServiceImpl extends ServiceImpl implements AccOperationHistoryService { +public class AccOperationHistoryServiceImpl extends ServiceImpl implements AccOperationHistoryService { @Resource private RemoteUserService remoteUserService; - public List selectAccOperationHistory(AccOperationQueryParam param) { + public List selectAccOperationHistory(AccOperationQueryParam param) { String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue()); - List operationRecordList = this.baseMapper.queryPageAccOperationRecord(param, encryptedSearchValue); + List operationRecordList = this.baseMapper.queryPageAccOperationRecord(param, encryptedSearchValue); if(CollUtil.isNotEmpty(operationRecordList)) { - for(AccOperationHistory history : operationRecordList) { + for(AccountInfoHistoryVO history : operationRecordList) { history.setPhone(SM4EncryptUtils.sm4Decrypt(history.getPhone())); } } @@ -40,13 +41,11 @@ public class AccOperationHistoryServiceImpl extends ServiceImpl - + @@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from account_info - and account_id = #{accountId} @@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and account_id = #{accountId} @@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where account_id = #{accId} - + insert into account_info account_name, @@ -180,7 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update account_info account_id = #{accountId}, diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationHistoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationHistoryMapper.xml index 777509e..292d135 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationHistoryMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationHistoryMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - SELECT aih.id, aih.user_id, su.nick_name as userName,