From 36758547b12aa0be57d0e91e731747261274d2c7 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 14 Apr 2025 12:41:47 +0800 Subject: [PATCH] acc soft delete --- .../com/bonus/canteen/core/account/domain/AccInfo.java | 5 ++++- .../bonus/canteen/core/account/domain/AccInfoVo.java | 5 ++++- .../canteen/core/account/domain/AccWalletInfo.java | 4 ++++ .../core/account/domain/vo/AccWalletInfoVO.java | 4 ++++ .../main/resources/mapper/account/AccInfoMapper.xml | 10 +++++++--- .../resources/mapper/account/AccWalletInfoMapper.xml | 10 +++++++--- 6 files changed, 30 insertions(+), 8 deletions(-) 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/AccInfo.java index ec3eb34..118e009 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/AccInfo.java @@ -275,5 +275,8 @@ public class AccInfo extends BaseEntity { @ApiModelProperty(value = "预留字段3") private String reserved3; - + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; } 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 fcd1e5b..0c9bb45 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 @@ -34,5 +34,8 @@ public class AccInfoVo { private BigDecimal subFreezeBal; private BigDecimal accFreezeBalTotal; private List walletInfoList; - + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccWalletInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccWalletInfo.java index 8160dcc..d16f0a8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccWalletInfo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccWalletInfo.java @@ -65,5 +65,9 @@ public class AccWalletInfo extends BaseEntity { @Excel(name = "最后一次补贴日期", width = 30, dateFormat = "yyyy-MM-dd") private Date lastSubsidyTime; + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccWalletInfoVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccWalletInfoVO.java index 8a99e6a..d8c0f63 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccWalletInfoVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccWalletInfoVO.java @@ -15,4 +15,8 @@ public class AccWalletInfoVO { private BigDecimal frozenBalance; private BigDecimal lastSubsidyAmount; private LocalDateTime lastSubsidyTime; + /** + * 删除标志（0代表存在 2代表删除） + */ + private String delFlag; } 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 622a1c2..6e81e2d 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 @@ -57,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -68,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" same_day_count, same_month_count, curr_cumu_amount, day_cumu_amount, month_sumu_amount, min_wallet_bal_limit, min_red_bal_limit, min_sub_bal_limit, month_full_reduce_amount, last_full_reduce_time, last_sub_time, sub_validity_date, last_sub_amount, last_wal_time, last_wal_amount, - revision, reserved1, reserved2, reserved3, create_by, create_time, update_by, update_time + revision, reserved1, reserved2, reserved3, create_by, create_time, update_by, update_time, del_flag from acc_info @@ -124,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and reserved1 = #{reserved1} and reserved2 = #{reserved2} and reserved3 = #{reserved3} + and del_flag = #{delFlag} @@ -179,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and reserved1 = #{reserved1} and reserved2 = #{reserved2} and reserved3 = #{reserved3} + and del_flag = #{delFlag} @@ -355,16 +358,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + del_flag = #{delFlag}, where acc_id = #{accId} - delete from acc_info where user_id = #{userId} + update acc_info set del_flag = '2' where user_id = #{userId} - delete from acc_info where acc_id in + update acc_info set del_flag = '2' where acc_id in #{accId} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccWalletInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccWalletInfoMapper.xml index 58014e2..02b6cb9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccWalletInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccWalletInfoMapper.xml @@ -17,10 +17,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select user_id, acc_id, wallet_id, wallet_bal, limit_balance, frozen_balance, expired_time, last_subsidy_amount, last_subsidy_time, create_by, create_time, update_by, update_time from acc_wallet_info + select user_id, acc_id, wallet_id, wallet_bal, limit_balance, frozen_balance, expired_time, last_subsidy_amount, + last_subsidy_time, create_by, create_time, update_by, update_time, del_flag + from acc_wallet_info @@ -105,11 +109,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from acc_wallet_info where user_id = #{userId} + update acc_wallet_info set del_flag = '2' where user_id = #{userId} - delete from acc_wallet_info where user_id in + update acc_wallet_info set del_flag = '2' where user_id in #{userId}