ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ChargingListQuery.java
@@ -31,6 +31,8 @@ private String phone; @ApiModelProperty("车牌号") private String licensePlate; @ApiModelProperty("是否白名单订单：0=否，1=是") private Integer isWhitelist; @ApiModelProperty("订单类型（1=充电订单（小程序），2=充电订单（刷卡））") private Integer orderType; ruoyi-api/ruoyi-api-order/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -5,4 +5,5 @@ com.ruoyi.order.api.factory.AccountingStrategyDetailOrderFallbackFactory com.ruoyi.order.api.factory.AccountingStrategyOrderFallbackFactory com.ruoyi.order.api.factory.ShoppingOrderFallbackFactory com.ruoyi.order.api.factory.JianGuanOrderFallbackFactory com.ruoyi.order.api.factory.JianGuanOrderFallbackFactory com.ruoyi.account.api.factory.AppUserWhitelistFallbackFactory ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserWhitelistMapper.java
@@ -8,7 +8,19 @@ */ public interface TAppUserWhitelistMapper extends BaseMapper<TAppUserWhitelist> { TAppUserWhitelist selectByPhoneIgnoreLogic(String phone); /** * 根据手机号查询未删除的白名单配置，避免已逻辑删除数据阻塞重新新增。 * * @param phone 用户手机号 * @return 未删除的白名单配置 */ TAppUserWhitelist selectValidByPhone(String phone); /** * 忽略逻辑删除条件更新白名单配置，用于编辑时显式恢复有效状态。 * * @param whitelist 白名单配置 * @return 更新行数 */ int updateByIdIgnoreLogic(TAppUserWhitelist whitelist); } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserWhitelistServiceImpl.java
@@ -81,8 +81,12 @@ @Override public Page<TAppUserWhitelist> pageList(AppUserWhitelistQueryDTO queryDTO) { if (queryDTO == null) { queryDTO = new AppUserWhitelistQueryDTO(); } Page<TAppUserWhitelist> page = this.lambdaQuery() .like(StringUtils.isNotBlank(queryDTO.getPhone()), TAppUserWhitelist::getPhone, queryDTO.getPhone()) .eq(TAppUserWhitelist::getDelFlag, false) .orderByDesc(BasePojo::getCreateTime) .page(Page.of(queryDTO.getPageCurr(), queryDTO.getPageSize())); fillDisplay(page.getRecords()); @@ -377,8 +381,14 @@ } } /** * 查询手机号对应的有效白名单配置，逻辑删除记录允许重新新增。 * * @param phone 用户手机号 * @return 有效白名单配置 */ private TAppUserWhitelist getByPhone(String phone) { return this.baseMapper.selectByPhoneIgnoreLogic(phone); return this.baseMapper.selectValidByPhone(phone); } private List<String> validateImportRow(AppUserWhitelistImportDTO row, Map<String, Site> siteCodeMap) { ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppUserWhitelistMapper.xml
@@ -21,11 +21,11 @@ id, app_user_id, phone, benefit_type, scope_type, partner_id, status, create_by, create_time, update_by, update_time, remark, del_flag </sql> <select id="selectByPhoneIgnoreLogic" resultMap="BaseResultMap"> <select id="selectValidByPhone" resultMap="BaseResultMap"> select <include refid="Base_Column_List" /> from t_app_user_whitelist where phone = #{phone} where phone = #{phone} and del_flag = 0 limit 1 </select>
@@ -1098,6 +1098,9 @@ <if test="req.status != null "> and a.status = #{req.status} </if> <if test="req.isWhitelist != null"> and a.is_whitelist = #{req.isWhitelist} </if> <if test="req.siteId != null "> and a.site_id = #{req.siteId} </if> @@ -1225,6 +1228,9 @@ <if test="req.status != null "> and b.status = #{req.status} </if> <if test="req.isWhitelist != null"> and b.is_whitelist = #{req.isWhitelist} </if> <if test="req.siteId != null "> and b.site_id = #{req.siteId} </if> @@ -1297,6 +1303,9 @@ <if test="req.status != null "> and co.status = #{req.status} </if> <if test="req.isWhitelist != null"> and co.is_whitelist = #{req.isWhitelist} </if> <if test="req.siteId != null "> and co.site_id = #{req.siteId} </if> @@ -1350,6 +1359,9 @@ <if test="req.status != null "> and co.status = #{req.status} </if> <if test="req.isWhitelist != null"> and co.is_whitelist = #{req.isWhitelist} </if> <if test="req.siteId != null "> and co.site_id = #{req.siteId} </if> @@ -1393,6 +1405,9 @@ <if test="req.status != null "> and t1.status = #{req.status} </if> <if test="req.isWhitelist != null"> and t1.is_whitelist = #{req.isWhitelist} </if> <if test="req.siteId != null "> and t1.site_id = #{req.siteId} </if>
