fix:第二版财务,去除最开始设计的冗余代码,修复业务员和跟单员无法查发票审核的情况

chenhang4442024
1 parent 07821ba4
Showing 14 changed files with 11 additions and 521 deletions
src/main/java/com/order/erp/domain/dto/order/CheckBillMappingDO.java
src/main/java/com/order/erp/domain/dto/order/InvoiceBillMappingDO.java
src/main/java/com/order/erp/job/FinanceJob.java
src/main/java/com/order/erp/mapper/order/CheckBillMappingMapper.java
src/main/java/com/order/erp/mapper/order/InvoiceBillMappingMapper.java
src/main/java/com/order/erp/mapper/order/InvoiceBillOrderMapper.java
src/main/java/com/order/erp/mapper/order/ProducePaymentCheckBillOrderMapper.java
src/main/java/com/order/erp/service/order/CheckBillMappingService.java
src/main/java/com/order/erp/service/order/InvoiceBillMappingService.java
src/main/java/com/order/erp/service/order/impl/CheckBillMappingServiceImpl.java
src/main/java/com/order/erp/service/order/impl/InvoiceBillMappingServiceImpl.java
src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
src/main/java/com/order/erp/service/order/impl/ProducePaymentCheckBillOrderServiceImpl.java
-package com.order.erp.domain.dto.order;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.order.erp.domain.dto.BaseDO;
-import lombok.*;
-import lombok.experimental.SuperBuilder;
-
-import java.io.Serializable;
-
-/**
- * 生产科对账单应收账单映射表(CheckBillMapping)实体类
- *
- * @author makejava
- * @since 2024-08-05 16:26:36
- */
-@TableName("check_bill_mapping")
-@Data
-@AllArgsConstructor
-@ToString
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-@SuperBuilder
-public class CheckBillMappingDO extends BaseDO implements Serializable {
-    private static final long serialVersionUID = 199786248752278040L;
-
-    private Long id;
-    /**
-     * 生产科对账单号
-     */
-    private String checkNo;
-    /**
-     * check账单id
-     */
-    private Long checkBillId;
-    /**
-     * 订单id
-     */
-    private Long orderId;
-
-}
-package com.order.erp.domain.dto.order;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.order.erp.domain.dto.BaseDO;
-import lombok.*;
-import lombok.experimental.SuperBuilder;
-
-import java.io.Serializable;
-
-/**
- * 应收款账单关联订单映射表(InvoiceBillMapping)实体类
- *
- * @author makejava
- * @since 2024-08-05 16:26:36
- */
-@TableName("invoice_bill_mapping")
-@Data
-@AllArgsConstructor
-@ToString
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-@SuperBuilder
-public class InvoiceBillMappingDO extends BaseDO implements Serializable {
-
-    private Long id;
-    /**
-     * 发票单号
-     */
-    private String invoiceNo;
-    /**
-     * invoice账单id
-     */
-    private Long invoiceBillId;
-    /**
-     * 订单id
-     */
-    private Long orderId;
-
-}
@@ -44,7 +44,7 @@ public class FinanceJob {
     @Resource
     private RedisUtils redisService;
     //每天的7:15执行一次
-    @Scheduled(cron = "0 15 7 * * ?", zone = "Asia/Shanghai")
+//    @Scheduled(cron = "0 15 7 * * ?", zone = "Asia/Shanghai")
  
     //每分钟执行一次
 //    @Scheduled(cron = "0 * * * * ?", zone = "Asia/Shanghai")
-package com.order.erp.mapper.order;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.order.erp.domain.dto.order.CheckBillMappingDO;
-
-/**
- * 生产科对账单应收账单映射表(CheckBillMapping)表数据库访问层
- *
- * @author makejava
- * @since 2024-08-05 16:26:37
- */
-public interface CheckBillMappingMapper extends BaseMapper<CheckBillMappingDO> {
-
-
-}
-
-package com.order.erp.mapper.order;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.order.erp.domain.dto.order.InvoiceBillMappingDO;
-
-/**
- * 应收款账单关联订单映射表(InvoiceBillMapping)表数据库访问层
- *
- * @author makejava
- * @since 2024-08-05 16:26:36
- */
-public interface InvoiceBillMappingMapper extends BaseMapper<InvoiceBillMappingDO> {
-
-
-}
-
@@ -18,7 +18,7 @@ import java.util.List;
  * @since 2024-08-05 16:26:34
  */
 public interface InvoiceBillOrderMapper extends BaseMapper<InvoiceBillOrderDO> {
-@Select("SELECT * FROM invoice_bill_order WHERE status in('-1','20') and enable_flag=10 and DATE_SUB(CURDATE(), INTERVAL 1 YEAR) <= date(create_time);")
+@Select("SELECT * FROM invoice_bill_order WHERE status = 0 and enable_flag=10 and DATE_SUB(CURDATE(), INTERVAL 1 YEAR) <= date(create_time);")
 List<InvoiceBillOrderDO> getOverEventList();
  
     IPage<FinanceOrderResultVO> byConditionGetOrder(@Param("page") Page<FinanceOrderResultVO> page, @Param("queryVO") InvoiceBillOrderQueryVO queryVO);
@@ -13,7 +13,7 @@ import java.util.List;
  * @since 2024-08-05 16:26:35
  */
 public interface ProducePaymentCheckBillOrderMapper extends BaseMapper<ProducePaymentCheckBillOrderDO> {
-    @Select("SELECT * FROM produce_payment_check_bill_order WHERE status in('-1','20') and enable_flag=10 and DATE_SUB(CURDATE(), INTERVAL 1 YEAR) <= date(create_time);")
+    @Select("SELECT * FROM produce_payment_check_bill_order WHERE status = 0 and enable_flag=10 and DATE_SUB(CURDATE(), INTERVAL 1 YEAR) <= date(create_time);")
     List<ProducePaymentCheckBillOrderDO> getOverEventList();
  
  
-package com.order.erp.service.order;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.order.erp.common.constant.ServerResult;
-import com.order.erp.domain.dto.order.CheckBillMappingDO;
-import com.order.erp.domain.vo.order.CheckBillMappingQueryVO;
-import com.order.erp.domain.vo.order.CheckBillMappingVO;
-
-/**
- * 生产科对账单应收账单映射表(CheckBillMapping)表服务接口
- *
- * @author makejava
- * @since 2024-08-05 16:26:37
- */
-public interface CheckBillMappingService extends IService<CheckBillMappingDO> {
-
-    /**
-     * 通过ID查询单条数据
-     *
-     * @param checkBillMappingQueryVO 主键
-     * @return 实例对象
-     */
-    ServerResult queryById(CheckBillMappingQueryVO checkBillMappingQueryVO);
-
-    /**
-     * 分页查询
-     *
-     * @param checkBillMappingQueryVO 筛选条件
-     * @return 查询结果
-     */
-    ServerResult list(CheckBillMappingQueryVO checkBillMappingQueryVO);
-
-    /**
-     * 新增数据
-     *
-     * @param checkBillMappingVO 数据VO
-     * @return 新增结果
-     */
-    ServerResult add(CheckBillMappingVO checkBillMappingVO);
-
-    /**
-     * 修改数据
-     *
-     * @param checkBillMappingVO 数据VO
-     * @return 编辑结果
-     */
-    ServerResult edit(CheckBillMappingVO checkBillMappingVO);
-
-    /**
-     * 通过主键删除数据
-     *
-     * @param checkBillMappingQueryVO 筛选条件
-     * @return 是否成功
-     */
-    ServerResult deleteById(CheckBillMappingQueryVO checkBillMappingQueryVO);
-
-}
-package com.order.erp.service.order;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.order.erp.common.constant.ServerResult;
-import com.order.erp.domain.dto.order.InvoiceBillMappingDO;
-import com.order.erp.domain.vo.order.InvoiceBillMappingQueryVO;
-import com.order.erp.domain.vo.order.InvoiceBillMappingVO;
-
-/**
- * 应收款账单关联订单映射表(InvoiceBillMapping)表服务接口
- *
- * @author makejava
- * @since 2024-08-05 16:26:36
- */
-public interface InvoiceBillMappingService extends IService<InvoiceBillMappingDO> {
-
-    /**
-     * 通过ID查询单条数据
-     *
-     * @param invoiceBillMappingQueryVO 主键
-     * @return 实例对象
-     */
-    ServerResult queryById(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO);
-
-    /**
-     * 分页查询
-     *
-     * @param invoiceBillMappingQueryVO 筛选条件
-     * @return 查询结果
-     */
-    ServerResult list(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO);
-
-    /**
-     * 新增数据
-     *
-     * @param invoiceBillMappingVO 数据VO
-     * @return 新增结果
-     */
-    ServerResult add(InvoiceBillMappingVO invoiceBillMappingVO);
-
-    /**
-     * 修改数据
-     *
-     * @param invoiceBillMappingVO 数据VO
-     * @return 编辑结果
-     */
-    ServerResult edit(InvoiceBillMappingVO invoiceBillMappingVO);
-
-    /**
-     * 通过主键删除数据
-     *
-     * @param invoiceBillMappingQueryVO 筛选条件
-     * @return 是否成功
-     */
-    ServerResult deleteById(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO);
-
-}
-package com.order.erp.service.order.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.order.erp.common.constant.Constant;
-import com.order.erp.common.constant.ServerResult;
-import com.order.erp.common.utils.PageUtils;
-import com.order.erp.domain.dto.order.CheckBillMappingDO;
-import com.order.erp.domain.vo.order.CheckBillMappingQueryVO;
-import com.order.erp.domain.vo.order.CheckBillMappingVO;
-import com.order.erp.mapper.order.CheckBillMappingMapper;
-import com.order.erp.service.order.CheckBillMappingService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * 生产科对账单应收账单映射表(CheckBillMapping)表服务实现类
- *
- * @author makejava
- * @since 2024-08-05 16:26:37
- */
-@Slf4j
-@Service
-public class CheckBillMappingServiceImpl extends ServiceImpl<CheckBillMappingMapper, CheckBillMappingDO> implements CheckBillMappingService {
-
-
-    /**
-     * 通过ID查询单条数据
-     * <p>
-     * checkBillMappingQueryVO 主键
-     *
-     * @return 实例对象
-     */
-    @Override
-    public ServerResult queryById(CheckBillMappingQueryVO checkBillMappingQueryVO) {
-        if (Objects.isNull(checkBillMappingQueryVO.getId())) {
-            return ServerResult.fail("id 不能为空");
-        }
-        CheckBillMappingDO CheckBillMappingDo = getById(checkBillMappingQueryVO.getId());
-        if (Objects.isNull(CheckBillMappingDo)) {
-            return ServerResult.success(null);
-        }
-        return ServerResult.success(BeanUtil.copyProperties(CheckBillMappingDo, CheckBillMappingVO.class));
-    }
-
-    /**
-     * 分页查询
-     *
-     * @param checkBillMappingQueryVO 筛选条件
-     * @return 查询结果
-     */
-    @Override
-    public ServerResult list(CheckBillMappingQueryVO checkBillMappingQueryVO) {
-
-        LambdaQueryWrapper<CheckBillMappingDO> queryWapper = new LambdaQueryWrapper<CheckBillMappingDO>()
-                .eq(CheckBillMappingDO::getEnableFlag, Constant.ENABLE_TEN)
-                .orderByDesc(CheckBillMappingDO::getId);
-        Page page = new Page<>(checkBillMappingQueryVO.getPage(), checkBillMappingQueryVO.getPageSize());
-        IPage<CheckBillMappingDO> iPage = page(page, queryWapper);
-        checkBillMappingQueryVO.setTotal(Long.valueOf(iPage.getTotal()).intValue());
-        return ServerResult.success(PageUtils.getPageReturn(null, checkBillMappingQueryVO));
-    }
-
-    /**
-     * 新增数据
-     *
-     * @param checkBillMappingVO 实例对象
-     * @return 实例对象
-     */
-    @Override
-    public ServerResult add(CheckBillMappingVO checkBillMappingVO) {
-        //todo 校验
-        if (Objects.nonNull(checkBillMappingVO.getId())) {
-            checkBillMappingVO.setId(null);
-        }
-        CheckBillMappingDO checkBillMappingDo = BeanUtil.copyProperties(checkBillMappingVO, CheckBillMappingDO.class);
-
-        save(checkBillMappingDo);
-
-        return ServerResult.success();
-    }
-
-    /**
-     * 修改数据
-     *
-     * @param checkBillMappingVO 实例对象
-     * @return 实例对象
-     */
-    @Override
-    public ServerResult edit(CheckBillMappingVO checkBillMappingVO) {
-        //todo 校验
-        if (Objects.isNull(checkBillMappingVO.getId())) {
-            return ServerResult.fail("id 不能为空");
-        }
-        CheckBillMappingDO checkBillMappingDo = BeanUtil.copyProperties(checkBillMappingVO, CheckBillMappingDO.class);
-
-        updateById(checkBillMappingDo);
-
-        return ServerResult.success();
-    }
-
-    /**
-     * 通过主键删除数据
-     *
-     * @param checkBillMappingQueryVO 筛选条件
-     * @return 是否成功
-     */
-    @Override
-    public ServerResult deleteById(CheckBillMappingQueryVO checkBillMappingQueryVO) {
-        List<Long> ids = checkBillMappingQueryVO.getIds();
-        if (CollUtil.isEmpty(ids)) {
-            return ServerResult.fail("ids 参数不能为空");
-        }
-        List<CheckBillMappingDO> checkBillMappingList = listByIds(ids);
-        if (CollUtil.isEmpty(checkBillMappingList)) {
-            return ServerResult.success();
-        }
-        //todo 校验是否可以逻辑删除
-        LambdaUpdateWrapper<CheckBillMappingDO> updateWrapper = new LambdaUpdateWrapper<CheckBillMappingDO>()
-                .in(CheckBillMappingDO::getId, ids)
-                .set(CheckBillMappingDO::getEnableFlag, Constant.UNABLE_TWENTY);
-        update(updateWrapper);
-        return ServerResult.success();
-    }
-}
-package com.order.erp.service.order.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.order.erp.common.constant.Constant;
-import com.order.erp.common.constant.ServerResult;
-import com.order.erp.common.utils.PageUtils;
-import com.order.erp.domain.dto.order.InvoiceBillMappingDO;
-import com.order.erp.domain.vo.order.InvoiceBillMappingQueryVO;
-import com.order.erp.domain.vo.order.InvoiceBillMappingVO;
-import com.order.erp.mapper.order.InvoiceBillMappingMapper;
-import com.order.erp.service.order.InvoiceBillMappingService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * 应收款账单关联订单映射表(InvoiceBillMapping)表服务实现类
- *
- * @author makejava
- * @since 2024-08-05 16:26:36
- */
-@Slf4j
-@Service
-public class InvoiceBillMappingServiceImpl extends ServiceImpl<InvoiceBillMappingMapper, InvoiceBillMappingDO> implements InvoiceBillMappingService {
-
-
-    /**
-     * 通过ID查询单条数据
-     * <p>
-     * invoiceBillMappingQueryVO 主键
-     *
-     * @return 实例对象
-     */
-    @Override
-    public ServerResult queryById(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO) {
-        if (Objects.isNull(invoiceBillMappingQueryVO.getId())) {
-            return ServerResult.fail("id 不能为空");
-        }
-        InvoiceBillMappingDO InvoiceBillMappingDo = getById(invoiceBillMappingQueryVO.getId());
-        if (Objects.isNull(InvoiceBillMappingDo)) {
-            return ServerResult.success(null);
-        }
-        return ServerResult.success(BeanUtil.copyProperties(InvoiceBillMappingDo, InvoiceBillMappingVO.class));
-    }
-
-    /**
-     * 分页查询
-     *
-     * @param invoiceBillMappingQueryVO 筛选条件
-     * @return 查询结果
-     */
-    @Override
-    public ServerResult list(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO) {
-
-        LambdaQueryWrapper<InvoiceBillMappingDO> queryWapper = new LambdaQueryWrapper<InvoiceBillMappingDO>()
-                .eq(InvoiceBillMappingDO::getEnableFlag, Constant.ENABLE_TEN)
-                .orderByDesc(InvoiceBillMappingDO::getId);
-        Page page = new Page<>(invoiceBillMappingQueryVO.getPage(), invoiceBillMappingQueryVO.getPageSize());
-        IPage<InvoiceBillMappingDO> iPage = page(page, queryWapper);
-        invoiceBillMappingQueryVO.setTotal(Long.valueOf(iPage.getTotal()).intValue());
-        return ServerResult.success(PageUtils.getPageReturn(null, invoiceBillMappingQueryVO));
-    }
-
-    /**
-     * 新增数据
-     *
-     * @param invoiceBillMappingVO 实例对象
-     * @return 实例对象
-     */
-    @Override
-    public ServerResult add(InvoiceBillMappingVO invoiceBillMappingVO) {
-        //todo 校验
-        if (Objects.nonNull(invoiceBillMappingVO.getId())) {
-            invoiceBillMappingVO.setId(null);
-        }
-        InvoiceBillMappingDO invoiceBillMappingDo = BeanUtil.copyProperties(invoiceBillMappingVO, InvoiceBillMappingDO.class);
-
-        save(invoiceBillMappingDo);
-
-        return ServerResult.success();
-    }
-
-    /**
-     * 修改数据
-     *
-     * @param invoiceBillMappingVO 实例对象
-     * @return 实例对象
-     */
-    @Override
-    public ServerResult edit(InvoiceBillMappingVO invoiceBillMappingVO) {
-        //todo 校验
-        if (Objects.isNull(invoiceBillMappingVO.getId())) {
-            return ServerResult.fail("id 不能为空");
-        }
-        InvoiceBillMappingDO invoiceBillMappingDo = BeanUtil.copyProperties(invoiceBillMappingVO, InvoiceBillMappingDO.class);
-
-        updateById(invoiceBillMappingDo);
-
-        return ServerResult.success();
-    }
-
-    /**
-     * 通过主键删除数据
-     *
-     * @param invoiceBillMappingQueryVO 筛选条件
-     * @return 是否成功
-     */
-    @Override
-    public ServerResult deleteById(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO) {
-        List<Long> ids = invoiceBillMappingQueryVO.getIds();
-        if (CollUtil.isEmpty(ids)) {
-            return ServerResult.fail("ids 参数不能为空");
-        }
-        List<InvoiceBillMappingDO> invoiceBillMappingList = listByIds(ids);
-        if (CollUtil.isEmpty(invoiceBillMappingList)) {
-            return ServerResult.success();
-        }
-        //todo 校验是否可以逻辑删除
-        LambdaUpdateWrapper<InvoiceBillMappingDO> updateWrapper = new LambdaUpdateWrapper<InvoiceBillMappingDO>()
-                .in(InvoiceBillMappingDO::getId, ids)
-                .set(InvoiceBillMappingDO::getEnableFlag, Constant.UNABLE_TWENTY);
-        update(updateWrapper);
-        return ServerResult.success();
-    }
-}
@@ -66,8 +66,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
     @Resource
     private OrderProfitAnalysisService profitAnalysisService;
  
-    @Resource
-    private InvoiceBillMappingService invoiceBillMappingService;
+
  
     @Resource
     private OrderFieldLockApplyService orderFieldLockApplyService;
@@ -931,15 +930,6 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
      * @param invoiceBillOrderDO
      * @return
      */
-    private List<InvoiceBillMappingDO> buildInvoiceBillMappingDOS(InvoiceBillCreateVO createVO, InvoiceBillOrderDO invoiceBillOrderDO) {
-        return createVO.getOrderIds().stream().map(x -> {
-            return InvoiceBillMappingDO.builder()
-                    .orderId(x)
-                    .invoiceBillId(invoiceBillOrderDO.getId())
-                    .invoiceNo(invoiceBillOrderDO.getInvoiceNo())
-                    .build();
-        }).collect(Collectors.toList());
-    }
  
     /**
      * @param createVO
@@ -170,15 +170,15 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                                         }
                                     }
                                 }
-
-                        }}//这里结束  上述为待审核列表中应收款要显示内部编码。   //这部分不需要了。
+                        }
+                        }//这里结束  上述为待审核列表中应收款要显示内部编码。   //这部分不需要了。
                         //这部分的目的是,对于跟单员和业务员他们也能查看到应收款和应付款中各自负责订单的审核情况。 而财务和admin则会执行else{},会看到所有的审核订单信息。
                         if(RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())){
-                            if(Objects.nonNull(orderLockFieldVO.getProducePaymentCheckBillFieldVO()) && orderLockFieldVO.getProducePaymentCheckBillFieldVO().getBusinesPerson().equals(loginUserName)){
+                            if((Objects.nonNull(orderLockFieldVO.getProducePaymentCheckBillFieldVO()) && orderLockFieldVO.getProducePaymentCheckBillFieldVO().getBusinesPerson().equals(loginUserName))||(Objects.nonNull(orderLockFieldVO.getCheckBillOrderDO()) && orderLockFieldVO.getCheckBillOrderDO().getBusinesPerson().equals(loginUserName))){
                                 resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                             }
                         } else if (RoleEnum.TRACKER_USER.getCode().equals(roleEnum.getCode())) {
-                            if(Objects.nonNull(orderLockFieldVO.getProducePaymentCheckBillFieldVO()) && orderLockFieldVO.getProducePaymentCheckBillFieldVO().getTrackerUser().equals(loginUserName)){
+                            if((Objects.nonNull(orderLockFieldVO.getProducePaymentCheckBillFieldVO()) && orderLockFieldVO.getProducePaymentCheckBillFieldVO().getTrackerUser().equals(loginUserName))||(Objects.nonNull(orderLockFieldVO.getCheckBillOrderDO()) && orderLockFieldVO.getCheckBillOrderDO().getTrackerUser().equals(loginUserName))){
                                 resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                             }
                         } else{
@@ -455,7 +455,8 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             if (!checkNos.isEmpty()) {
                 // 使用参数化查询避免 SQL 拼接问题
                 queryWrapper.apply(
-                          "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.producePaymentCheckBillFieldVO.checkNo')) = {0}",
+                          "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.producePaymentCheckBillFieldVO.checkNo')) = {0}"+
+                                  "OR JSON_UNQUOTE(JSON_EXTRACT(fields, '$.checkBillOrderDO.checkNo')) = {0}",
                         checkNos
                 );
             }
@@ -59,8 +59,7 @@ import java.util.stream.Stream;
 @Service
 public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl<ProducePaymentCheckBillOrderMapper, ProducePaymentCheckBillOrderDO> implements ProducePaymentCheckBillOrderService {
  
-    @Resource
-    private CheckBillMappingService checkBillMappingService;
+
  
     @Resource
     private OrderBaseInfoService orderBaseInfoService;
@@ -749,15 +748,6 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
      * @param checkBillOrderDO
      * @return
      */
-    private List<CheckBillMappingDO> buildCheckBillMappingDOS(ProducePaymentCheckBillCreateVO createVO, ProducePaymentCheckBillOrderDO checkBillOrderDO) {
-        return createVO.getOrderIds().stream().map(x -> {
-            return CheckBillMappingDO.builder()
-                    .orderId(x)
-                    .checkBillId(checkBillOrderDO.getId())
-                    .checkNo(checkBillOrderDO.getCheckNo())
-                    .build();
-        }).collect(Collectors.toList());
-    }
  
     /**
      * @param createVO