acc soft delete

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;
 }

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<AccWalletInfo> walletInfoList;
-
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    private String delFlag;
 }

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;
 
 }

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;
 }

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml

@@ -57,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="delFlag" column="del_flag"/>
     </resultMap>
 
     <sql id="selectAccInfoVo">
@@ -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
     </sql>
 
@@ -124,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reserved1 != null  and reserved1 != ''"> and reserved1 = #{reserved1}</if>
             <if test="reserved2 != null  and reserved2 != ''"> and reserved2 = #{reserved2}</if>
             <if test="reserved3 != null  and reserved3 != ''"> and reserved3 = #{reserved3}</if>
+            <if test="delFlag != null  and delFlag != ''"> and del_flag = #{delFlag}</if>
         </where>
     </select>
 
@@ -179,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reserved1 != null  and reserved1 != ''"> and reserved1 = #{reserved1}</if>
             <if test="reserved2 != null  and reserved2 != ''"> and reserved2 = #{reserved2}</if>
             <if test="reserved3 != null  and reserved3 != ''"> and reserved3 = #{reserved3}</if>
+            <if test="delFlag != null  and delFlag != ''"> and del_flag = #{delFlag}</if>
         </where>
     </select>
 
@@ -355,16 +358,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
         </trim>
         where acc_id = #{accId}
     </update>
 
     <delete id="deleteAccInfoByUserId" parameterType="Long">
-        delete from acc_info where user_id = #{userId}
+        update acc_info set del_flag = '2' where user_id = #{userId}
     </delete>
 
     <delete id="deleteAccInfoByIds" parameterType="String">
-        delete from acc_info where acc_id in
+        update acc_info set del_flag = '2' where acc_id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{accId}
         </foreach>

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccWalletInfoMapper.xml

@@ -17,10 +17,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="delFlag" column="del_flag"/>
     </resultMap>
 
     <sql id="selectAccWalletInfoVo">
-        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
     </sql>
 
     <select id="selectAccWalletInfoList" parameterType="com.bonus.canteen.core.account.domain.AccWalletInfo" resultMap="AccWalletInfoResult">
@@ -33,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="expiredTime != null "> and expired_time = #{expiredTime}</if>
             <if test="lastSubsidyAmount != null "> and last_subsidy_amount = #{lastSubsidyAmount}</if>
             <if test="lastSubsidyTime != null "> and last_subsidy_time = #{lastSubsidyTime}</if>
+            <if test="delFlag != null "> and del_flag = #{delFlag}</if>
         </where>
     </select>
     
@@ -105,11 +109,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <delete id="deleteAccWalletInfoByUserId" parameterType="Long">
-        delete from acc_wallet_info where user_id = #{userId}
+        update acc_wallet_info set del_flag = '2' where user_id = #{userId}
     </delete>
 
     <delete id="deleteAccWalletInfoByUserIds" parameterType="String">
-        delete from acc_wallet_info where user_id in 
+        update acc_wallet_info set del_flag = '2' where user_id in
         <foreach item="userId" collection="array" open="(" separator="," close=")">
             #{userId}
         </foreach>