Merge remote-tracking branch 'origin/master'

ruoyi-api/ruoyi-api-backstage/src/main/java/org/dromara/backstage/api/RemoteXfExceptionService.java

@@ -0,0 +1,16 @@
+package org.dromara.backstage.api;
+
+/**
+ * 消费明细异常远程服务
+ *
+ * @author Lion Li
+ */
+public interface RemoteXfExceptionService {
+
+    /**
+     * 发送消费明细异常通知短信
+     * @param mobile 手机号
+     * @param message 消费内容
+     */
+    void sendExceptionSms(String mobile, String message);
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/lock/LockBusiness.java

@@ -347,8 +347,9 @@ private JSONObject buildAndSendLockRecordRequest(String lockId, int pageNo) {
         Map<String, Object> formMap = this.setGuestCardParam(bo);
         String groupIds = "0000";
         if (ObjectUtil.notEqual(bo.getCardUseType(), "1024")) {
-            StringBuilder sb = new StringBuilder();
+            //StringBuilder sb = new StringBuilder();
             List<String> areaIds = List.of(bo.getGroupIds().split(","));
+            List<String> groupIdList = new ArrayList<>(areaIds.size());
 
             for (String areaId : areaIds) {
                 List<PtRoomVo> roomVos = roomService.queryHotelRoomList(Long.valueOf(areaId));
@@ -367,9 +368,10 @@ private JSONObject buildAndSendLockRecordRequest(String lockId, int pageNo) {
                 mapGroup.put("OPERATETYPE", "2");
                 result = lockUtils.sendPost(mapGroup, "operateLockGroup");
                 obj = JSONUtil.parseObj(result);
-                sb.append(obj.getStr("checkGroupId"));
+                //sb.append(obj.getStr("checkGroupId"));
+                groupIdList.add(obj.getStr("checkGroupId"));
             }
-            groupIds = sb.toString();
+            groupIds = String.join(",", groupIdList);;
         }
         formMap.put("groupIds", groupIds);
         formMap.put("loraCardUsage", bo.getCardUseType());

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/payments/PayOrderBusiness.java

@@ -21,7 +21,7 @@ import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.enums.*;
 import org.dromara.common.core.exception.consume.ConsumeException;
-import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.redis.utils.CacheUtils;
 import org.dromara.consume.api.RemoteConsumeService;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
@@ -198,7 +198,7 @@ public class PayOrderBusiness {
             R<PurseInOutBo> result = createNormalOrder(bo);
             if (result.getCode() == R.SUCCESS) {
                 // 如果充值成功，更新缓存中的余额
-                updateCacheBalanceByUserId(bo.getUserId(), bo.getReceiptMoney());
+                updateCacheBalanceByUserId(bo.getUserId(), bo.getReceiptMoney(), bo.getBagCode());
                 return R.ok(result.getData());
             } else {
                 return R.fail(result.getMsg());
@@ -228,7 +228,7 @@ public class PayOrderBusiness {
             R<PurseInOutBo> result = createNormalOrder(boCopy);
             if (result.getCode() == R.SUCCESS) {
                 // 如果退款成功，更新缓存中的余额
-                updateCacheBalanceByUserId(bo.getUserId(), boCopy.getReceiptMoney());
+                updateCacheBalanceByUserId(bo.getUserId(), boCopy.getReceiptMoney(),bo.getBagCode());
                 return R.ok(result.getData());
             } else {
                 return R.fail(result.getMsg(), boCopy);
@@ -296,4 +296,16 @@ public class PayOrderBusiness {
         balance = balance.add(dealMoney);
         remoteConsumeService.cacheUserTotalBalance(id, balance);
     }
+
+    private void updateCacheBalanceByUserId(Long id, BigDecimal dealMoney, String bagCode) {
+        String key = String.format("%s_%s", id, bagCode);
+        BigDecimal balance = CacheUtils.get(CacheNames.USER_BAG_BALANCE, key);
+        if (balance == null) {
+            balance = dealMoney;
+        } else {
+            balance = balance.add(dealMoney);
+        }
+        CacheUtils.put(CacheNames.USER_BAG_BALANCE, key, balance);
+    }
+
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfExceptionController.java

@@ -0,0 +1,106 @@
+package org.dromara.backstage.consumption.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.backstage.consumption.domain.vo.XfExceptionVo;
+import org.dromara.backstage.consumption.domain.bo.XfExceptionBo;
+import org.dromara.backstage.consumption.service.IXfExceptionService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 消费明细异常
+ * 前端访问路由地址为:/consumption/xfException
+ *
+ * @author LionLi
+ * @date 2025-09-15
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/consumption/xfException")
+public class XfExceptionController extends BaseController {
+
+    private final IXfExceptionService xfExceptionService;
+
+    /**
+     * 查询消费明细异常列表
+     */
+    @SaCheckPermission("consumption:xfException:list")
+    @GetMapping("/list")
+    public TableDataInfo<XfExceptionVo> list(XfExceptionBo bo, PageQuery pageQuery) {
+        return xfExceptionService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出消费明细异常列表
+     */
+    @SaCheckPermission("consumption:xfException:export")
+    @Log(title = "消费明细异常", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(XfExceptionBo bo, HttpServletResponse response) {
+        List<XfExceptionVo> list = xfExceptionService.queryList(bo);
+        ExcelUtil.exportExcel(list, "消费明细异常", XfExceptionVo.class, response);
+    }
+
+    /**
+     * 获取消费明细异常详细信息
+     *
+     * @param exceptId 主键
+     */
+    @SaCheckPermission("consumption:xfException:query")
+    @GetMapping("/{exceptId}")
+    public R<XfExceptionVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long exceptId) {
+        return R.ok(xfExceptionService.queryById(exceptId));
+    }
+
+    /**
+     * 新增消费明细异常
+     */
+    @SaCheckPermission("consumption:xfException:add")
+    @Log(title = "消费明细异常", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody XfExceptionBo bo) {
+        return toAjax(xfExceptionService.insertByBo(bo));
+    }
+
+    /**
+     * 修改消费明细异常
+     */
+    @SaCheckPermission("consumption:xfException:edit")
+    @Log(title = "消费明细异常", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody XfExceptionBo bo) {
+        return toAjax(xfExceptionService.updateByBo(bo));
+    }
+
+    /**
+     * 删除消费明细异常
+     *
+     * @param exceptIds 主键串
+     */
+    @SaCheckPermission("consumption:xfException:remove")
+    @Log(title = "消费明细异常", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{exceptIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] exceptIds) {
+        return toAjax(xfExceptionService.deleteWithValidByIds(List.of(exceptIds), true));
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/XfException.java

@@ -0,0 +1,109 @@
+package org.dromara.backstage.consumption.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 消费明细异常对象 t_xf_exception
+ *
+ * @author LionLi
+ * @date 2025-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_xf_exception")
+public class XfException extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 消费明细异常Id,主键
+     */
+    @TableId(value = "except_id")
+    private Long exceptId;
+
+    /**
+     * 卡流水号
+     */
+    private Long cardNo;
+
+    /**
+     * 物理卡号
+     */
+    private Long factoryId;
+
+    /**
+     * 设备机号
+     */
+    private Long termNo;
+
+    /**
+     * 机器流水号
+     */
+    private Long termRecordId;
+
+    /**
+     * 对应原始记录表中的record_Id
+     */
+    private Long recordId;
+
+    /**
+     * 人员Id
+     */
+    private Long userId;
+
+    /**
+     * 学/工号
+     */
+    private String userNumb;
+
+    /**
+     * 用户姓名
+     */
+    private String realName;
+
+    /**
+     * 消费日期
+     */
+    private Date consumeDate;
+
+    /**
+     * 消费金额
+     */
+    private Long consumeMoney;
+
+    /**
+     * 产生异常的请求数据
+     */
+    private String requestData;
+
+    /**
+     * 异常说明
+     */
+    private String exceptInfo;
+
+    /**
+     * 处理标志(0-未处理 1-已处理)
+     */
+    private String status;
+
+    /**
+     * 处理说明
+     */
+    private String dealInfo;
+
+    /**
+     * 删除标志(0-未删除 2-已删除)
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/bo/XfExceptionBo.java

@@ -0,0 +1,115 @@
+package org.dromara.backstage.consumption.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.backstage.consumption.domain.XfException;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 消费明细异常业务对象 t_xf_exception
+ *
+ * @author LionLi
+ * @date 2025-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = XfException.class, reverseConvertGenerate = false)
+public class XfExceptionBo extends BaseEntity {
+
+    /**
+     * 消费明细异常Id,主键
+     */
+    private Long exceptId;
+
+    /**
+     * 卡流水号
+     */
+    @NotNull(message = "卡流水号不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long cardNo;
+
+    /**
+     * 物理卡号
+     */
+    @NotNull(message = "物理卡号不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long factoryId;
+
+    /**
+     * 设备机号
+     */
+    @NotNull(message = "设备机号不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long termNo;
+
+    /**
+     * 机器流水号
+     */
+    @NotNull(message = "机器流水号不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long termRecordId;
+
+    /**
+     * 对应原始记录表中的record_Id
+     */
+    @NotNull(message = "对应原始记录表中的record_Id不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long recordId;
+
+    /**
+     * 人员Id
+     */
+    @NotNull(message = "人员Id不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long userId;
+
+    /**
+     * 学/工号
+     */
+    @NotBlank(message = "学/工号不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String userNumb;
+
+    /**
+     * 用户姓名
+     */
+    @NotBlank(message = "用户姓名不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String realName;
+
+    /**
+     * 消费日期
+     */
+    @NotNull(message = "消费日期不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Date consumeDate;
+
+    /**
+     * 消费金额
+     */
+    @NotNull(message = "消费金额不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long consumeMoney;
+
+    /**
+     * 产生异常的请求数据
+     */
+    @NotBlank(message = "产生异常的请求数据不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String requestData;
+
+    /**
+     * 异常说明
+     */
+    @NotBlank(message = "异常说明不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String exceptInfo;
+
+    /**
+     * 处理标志(0-未处理 1-已处理)
+     */
+    @NotBlank(message = "处理标志(0-未处理 1-已处理)不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String status;
+
+    /**
+     * 处理说明
+     */
+    private String dealInfo;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/vo/XfExceptionVo.java

@@ -0,0 +1,88 @@
+package org.dromara.backstage.consumption.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.backstage.consumption.domain.XfException;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 消费明细异常视图对象 t_xf_exception
+ *
+ * @author LionLi
+ * @date 2025-09-15
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = XfException.class)
+public class XfExceptionVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 物理卡号
+     */
+    @ExcelProperty(value = "物理卡号")
+    private Long factoryId;
+
+    /**
+     * 设备机号
+     */
+    @ExcelProperty(value = "设备机号")
+    private Long termNo;
+
+    /**
+     * 用户姓名
+     */
+    @ExcelProperty(value = "用户姓名")
+    private String realName;
+
+    /**
+     * 消费日期
+     */
+    @ExcelProperty(value = "消费日期")
+    private Date consumeDate;
+
+    /**
+     * 消费金额
+     */
+    @ExcelProperty(value = "消费金额")
+    private Long consumeMoney;
+
+    /**
+     * 产生异常的请求数据
+     */
+    @ExcelProperty(value = "产生异常的请求数据")
+    private String requestData;
+
+    /**
+     * 异常说明
+     */
+    @ExcelProperty(value = "异常说明")
+    private String exceptInfo;
+
+    /**
+     * 处理标志(0-未处理 1-已处理)
+     */
+    @ExcelProperty(value = "处理标志(0-未处理 1-已处理)")
+    private String status;
+
+    /**
+     * 处理说明
+     */
+    @ExcelProperty(value = "处理说明")
+    private String dealInfo;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/dubbo/RemoteXfExceptionServiceImpl.java

@@ -0,0 +1,29 @@
+package org.dromara.backstage.consumption.dubbo;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.dromara.backstage.api.RemoteXfExceptionService;
+import org.dromara.backstage.business.self.SelfBusiness;
+import org.springframework.stereotype.Service;
+
+/**
+ * name: RemoteXfExceptionServiceImpl
+ * package: org.dromara.backstage.consumption.dubbo
+ * description: 消费明细异常远程服务实现
+ * date: 2025-09-15 15:13:56 15:13
+ *
+ * @author luoyibo
+ * @version 0.1
+ * @since JDK 1.8
+ */
+@RequiredArgsConstructor
+@Service
+@DubboService
+public class RemoteXfExceptionServiceImpl implements RemoteXfExceptionService {
+    private final SelfBusiness selfBusiness;
+
+    @Override
+    public void sendExceptionSms(String mobile, String message) {
+        selfBusiness.sendSms(mobile, message);
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/mapper/XfExceptionMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.backstage.consumption.mapper;
+
+import org.dromara.backstage.consumption.domain.XfException;
+import org.dromara.backstage.consumption.domain.vo.XfExceptionVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 消费明细异常Mapper接口
+ *
+ * @author LionLi
+ * @date 2025-09-15
+ */
+public interface XfExceptionMapper extends BaseMapperPlus<XfException, XfExceptionVo> {
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/IXfExceptionService.java

@@ -0,0 +1,68 @@
+package org.dromara.backstage.consumption.service;
+
+import org.dromara.backstage.consumption.domain.vo.XfExceptionVo;
+import org.dromara.backstage.consumption.domain.bo.XfExceptionBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 消费明细异常Service接口
+ *
+ * @author LionLi
+ * @date 2025-09-15
+ */
+public interface IXfExceptionService {
+
+    /**
+     * 查询消费明细异常
+     *
+     * @param exceptId 主键
+     * @return 消费明细异常
+     */
+    XfExceptionVo queryById(Long exceptId);
+
+    /**
+     * 分页查询消费明细异常列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 消费明细异常分页列表
+     */
+    TableDataInfo<XfExceptionVo> queryPageList(XfExceptionBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的消费明细异常列表
+     *
+     * @param bo 查询条件
+     * @return 消费明细异常列表
+     */
+    List<XfExceptionVo> queryList(XfExceptionBo bo);
+
+    /**
+     * 新增消费明细异常
+     *
+     * @param bo 消费明细异常
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(XfExceptionBo bo);
+
+    /**
+     * 修改消费明细异常
+     *
+     * @param bo 消费明细异常
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(XfExceptionBo bo);
+
+    /**
+     * 校验并批量删除消费明细异常信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfExceptionServiceImpl.java

@@ -0,0 +1,148 @@
+package org.dromara.backstage.consumption.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.backstage.consumption.domain.bo.XfExceptionBo;
+import org.dromara.backstage.consumption.domain.vo.XfExceptionVo;
+import org.dromara.backstage.consumption.domain.XfException;
+import org.dromara.backstage.consumption.mapper.XfExceptionMapper;
+import org.dromara.backstage.consumption.service.IXfExceptionService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 消费明细异常Service业务层处理
+ *
+ * @author LionLi
+ * @date 2025-09-15
+ */
+@RequiredArgsConstructor
+@Service
+public class XfExceptionServiceImpl implements IXfExceptionService {
+
+    private final XfExceptionMapper baseMapper;
+
+    /**
+     * 查询消费明细异常
+     *
+     * @param exceptId 主键
+     * @return 消费明细异常
+     */
+    @Override
+    public XfExceptionVo queryById(Long exceptId){
+        return baseMapper.selectVoById(exceptId);
+    }
+
+    /**
+     * 分页查询消费明细异常列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 消费明细异常分页列表
+     */
+    @Override
+    public TableDataInfo<XfExceptionVo> queryPageList(XfExceptionBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<XfException> lqw = buildQueryWrapper(bo);
+        Page<XfExceptionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的消费明细异常列表
+     *
+     * @param bo 查询条件
+     * @return 消费明细异常列表
+     */
+    @Override
+    public List<XfExceptionVo> queryList(XfExceptionBo bo) {
+        LambdaQueryWrapper<XfException> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<XfException> buildQueryWrapper(XfExceptionBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<XfException> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getFactoryId() != null, XfException::getFactoryId, bo.getFactoryId());
+        lqw.eq(bo.getTermNo() != null, XfException::getTermNo, bo.getTermNo());
+        lqw.like(StringUtils.isNotBlank(bo.getRealName()), XfException::getRealName, bo.getRealName());
+        lqw.eq(bo.getConsumeDate() != null, XfException::getConsumeDate, bo.getConsumeDate());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), XfException::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    private QueryWrapper<XfException> buildQueryWrapper(XfExceptionBo bo,String tableAlias) {
+        QueryWrapper<XfException> lqw = new QueryWrapper<>();
+        String columnPrefix = "";
+        if(StringUtils.isNotBlank(tableAlias)){
+            columnPrefix = tableAlias + ".";
+        }
+        lqw.eq(bo.getFactoryId() != null, columnPrefix+"factory_id", bo.getFactoryId());
+        lqw.eq(bo.getTermNo() != null, columnPrefix+"term_no", bo.getTermNo());
+        lqw.like(StringUtils.isNotBlank(bo.getRealName()), columnPrefix+"real_name", bo.getRealName());
+        lqw.eq(bo.getConsumeDate() != null, columnPrefix+"consume_date", bo.getConsumeDate());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), columnPrefix+"status", bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增消费明细异常
+     *
+     * @param bo 消费明细异常
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(XfExceptionBo bo) {
+        XfException add = MapstructUtils.convert(bo, XfException.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setExceptId(add.getExceptId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改消费明细异常
+     *
+     * @param bo 消费明细异常
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(XfExceptionBo bo) {
+        XfException update = MapstructUtils.convert(bo, XfException.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(XfException entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除消费明细异常信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/consumption/XfExceptionMapper.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.backstage.consumption.mapper.XfExceptionMapper">
+
+    <resultMap type="org.dromara.backstage.consumption.domain.XfException" id="XfExceptionResult">
+            <result property="exceptId"    column="except_id"    />
+            <result property="tenantId"    column="tenant_id"    />
+            <result property="cardNo"    column="card_no"    />
+            <result property="factoryId"    column="factory_id"    />
+            <result property="termNo"    column="term_no"    />
+            <result property="termRecordId"    column="term_record_id"    />
+            <result property="recordId"    column="record_id"    />
+            <result property="userId"    column="user_id"    />
+            <result property="userNumb"    column="user_numb"    />
+            <result property="realName"    column="real_name"    />
+            <result property="consumeDate"    column="consume_date"    />
+            <result property="consumeMoney"    column="consume_money"    />
+            <result property="requestData"    column="request_data"    />
+            <result property="exceptInfo"    column="except_info"    />
+            <result property="status"    column="status"    />
+            <result property="dealInfo"    column="deal_info"    />
+            <result property="delFlag"    column="del_flag"    />
+            <result property="createDept"    column="create_dept"    />
+            <result property="createBy"    column="create_by"    />
+            <result property="createTime"    column="create_time"    />
+            <result property="updateBy"    column="update_by"    />
+            <result property="updateTime"    column="update_time"    />
+    </resultMap>
+</mapper>

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/business/ConsumeBusiness.java

@@ -223,6 +223,7 @@ public class ConsumeBusiness {
             if (R.isSuccess(result)) {
                 break;
             }
+
         }
         if (R.isError(result)) {
             log.info("[上传交易异步处理尝试3次失败，需要手工处理]-[{}]-[{}]", JSONUtil.toJsonStr(bo), JSONUtil.toJsonStr(result.getData()));

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/service/IConsumeDetailOriginalService.java

@@ -106,4 +106,6 @@ public interface IConsumeDetailOriginalService {
      * @return 如果删除成功返回true，否则返回false
      */
     boolean deleteByTermNoAndTermRecordId(Long termNo, Integer termRecordId);
+
+    XfConsumeDetailOriginalVo queryByTermNoAndTermRecordId(Long termNo, Integer termRecordId);
 }

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/service/impl/ConsumeDetailOriginalServiceImpl.java

@@ -151,9 +151,9 @@ public class ConsumeDetailOriginalServiceImpl implements IConsumeDetailOriginalS
     @Override
     public XfConsumeDetailOriginalVo queryByConsumeMoney(Long cardNo, Long termNo, Long termRecordId, BigDecimal consumeMoney) {
         return baseMapper.selectVoOne(new LambdaQueryWrapper<XfConsumeDetailOriginal>().eq(XfConsumeDetailOriginal::getCardNo, cardNo)
-                                          .eq(XfConsumeDetailOriginal::getTermNo, termNo)
-                                          .eq(XfConsumeDetailOriginal::getTermRecordId, termRecordId)
-                                          .eq(XfConsumeDetailOriginal::getConsumeMoney, consumeMoney));
+            .eq(XfConsumeDetailOriginal::getTermNo, termNo)
+            .eq(XfConsumeDetailOriginal::getTermRecordId, termRecordId)
+            .eq(XfConsumeDetailOriginal::getConsumeMoney, consumeMoney));
     }
 
     /**
@@ -166,9 +166,9 @@ public class ConsumeDetailOriginalServiceImpl implements IConsumeDetailOriginalS
     @Override
     public Integer updateRecordStatusByOrginId(Integer dataFlag, String originId) {
         LambdaUpdateWrapper<XfConsumeDetailOriginal> luw = new LambdaUpdateWrapper<XfConsumeDetailOriginal>()
-                                                               .set(XfConsumeDetailOriginal::getDataFlag, dataFlag)
-                                                               .eq(XfConsumeDetailOriginal::getOriginalId, originId)
-                                                               .eq(XfConsumeDetailOriginal::getDataFlag, 0);
+            .set(XfConsumeDetailOriginal::getDataFlag, dataFlag)
+            .eq(XfConsumeDetailOriginal::getOriginalId, originId)
+            .eq(XfConsumeDetailOriginal::getDataFlag, 0);
         return baseMapper.update(null, luw);
     }
 
@@ -184,9 +184,9 @@ public class ConsumeDetailOriginalServiceImpl implements IConsumeDetailOriginalS
     @Override
     public XfConsumeDetailOriginalVo queryByConsumeDate(Long cardNo, Long termNo, Long termRecordId, Date consumeDate) {
         return baseMapper.selectVoOne(new LambdaQueryWrapper<XfConsumeDetailOriginal>().eq(XfConsumeDetailOriginal::getCardNo, cardNo)
-                                          .eq(XfConsumeDetailOriginal::getTermNo, termNo)
-                                          .eq(XfConsumeDetailOriginal::getTermRecordId, termRecordId)
-                                          .eq(XfConsumeDetailOriginal::getConsumeDate, consumeDate));
+            .eq(XfConsumeDetailOriginal::getTermNo, termNo)
+            .eq(XfConsumeDetailOriginal::getTermRecordId, termRecordId)
+            .eq(XfConsumeDetailOriginal::getConsumeDate, consumeDate));
     }
 
     @Override
@@ -206,7 +206,7 @@ public class ConsumeDetailOriginalServiceImpl implements IConsumeDetailOriginalS
     public List<XfConsumeDetailOriginalVo> queryListByConsumeDate(Date beginDate, Date endDate) {
         return baseMapper.selectVoList(new LambdaQueryWrapper<XfConsumeDetailOriginal>()
             .gt(XfConsumeDetailOriginal::getConsumeDate, beginDate)
-            .le(XfConsumeDetailOriginal::getConsumeDate,endDate));
+            .le(XfConsumeDetailOriginal::getConsumeDate, endDate));
     }
 
     /**
@@ -219,6 +219,18 @@ public class ConsumeDetailOriginalServiceImpl implements IConsumeDetailOriginalS
     @Override
     public boolean deleteByTermNoAndTermRecordId(Long termNo, Integer termRecordId) {
         return baseMapper.delete(new LambdaQueryWrapper<XfConsumeDetailOriginal>().eq(XfConsumeDetailOriginal::getTermNo, termNo)
-                                      .eq(XfConsumeDetailOriginal::getTermRecordId, termRecordId)) > 0;
+            .eq(XfConsumeDetailOriginal::getTermRecordId, termRecordId)) > 0;
+    }
+
+    @Override
+    public XfConsumeDetailOriginalVo queryByTermNoAndTermRecordId(Long termNo, Integer termRecordId) {
+        List<XfConsumeDetailOriginalVo> list = baseMapper.selectVoList(new LambdaQueryWrapper<XfConsumeDetailOriginal>()
+            .eq(XfConsumeDetailOriginal::getTermNo, termNo)
+            .eq(XfConsumeDetailOriginal::getTermRecordId, termRecordId));
+
+        if (!list.isEmpty()) {
+            return list.get(0);
+        }
+        return null;
     }
 }