fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderHandleQueryBo.java

@@ -81,5 +81,6 @@ public class OrderHandleQueryBo extends BaseEntity {
 	@ApiModelProperty("结束时间")
 	private Long endTime;
 
-
+	@ApiModelProperty("超时关闭时间")
+	private Long overTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderHandleMapper.java

@@ -1,9 +1,11 @@
 package com.zhongzheng.modules.order.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.order.bo.OrderHandleQueryBo;
 import com.zhongzheng.modules.order.domain.OrderHandle;
 import com.zhongzheng.modules.order.vo.OrderHandleGoodsVo;
+import com.zhongzheng.modules.order.vo.OrderHandleOverVo;
 import com.zhongzheng.modules.order.vo.OrderHandleVo;
 
 import java.util.List;
@@ -20,4 +22,7 @@ public interface OrderHandleMapper extends BaseMapper<OrderHandle> {
 
     List<OrderHandleGoodsVo> selectOrderGoodsList(OrderHandleQueryBo bo);
 
+    @InterceptorIgnore(tenantLine = "true")
+    List<OrderHandleOverVo> selectOverTimeOrderList(OrderHandleQueryBo bo);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderHandleServiceImpl.java

@@ -21,6 +21,7 @@ import com.zhongzheng.modules.order.domain.*;
 import com.zhongzheng.modules.order.mapper.OrderHandleMapper;
 import com.zhongzheng.modules.order.service.*;
 import com.zhongzheng.modules.order.vo.OrderHandleGoodsVo;
+import com.zhongzheng.modules.order.vo.OrderHandleOverVo;
 import com.zhongzheng.modules.order.vo.OrderHandleStatisticsVo;
 import com.zhongzheng.modules.order.vo.OrderHandleVo;
 import com.zhongzheng.modules.system.domain.SysTenant;
@@ -412,8 +413,11 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
 
     @Override
     public Boolean overTimeCloseOrder() {
-        List<OrderHandle> list = this.list(new LambdaQueryWrapper<OrderHandle>().eq(OrderHandle::getPayStatus, 0).lt(OrderHandle::getOverTime,DateUtils.getNowTime()));
-        for(OrderHandle orderHandle : list){
+        OrderHandleQueryBo bo = new OrderHandleQueryBo();
+        bo.setOverTime(DateUtils.getNowTime());
+        List<OrderHandleOverVo> list = this.baseMapper.selectOverTimeOrderList(bo);
+        for(OrderHandleOverVo orderHandle : list){
+            ServletUtils.getRequestAttributes().getResponse().setHeader("TenantId", orderHandle.getTenantId());
             OrderHandleAddBo addBo = new OrderHandleAddBo();
             addBo.setHandleOrderSn(orderHandle.getHandleOrderSn());
             closeOrder(addBo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderHandleOverVo.java

@@ -0,0 +1,34 @@
+package com.zhongzheng.modules.order.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 经办录单视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2024-01-19
+ */
+@Data
+@ApiModel("经办录单视图对象")
+public class OrderHandleOverVo {
+	private static final long serialVersionUID = 1L;
+
+
+
+	/** 录单订单编号 */
+	@Excel(name = "录单订单编号")
+	@ApiModelProperty("录单订单编号")
+	private String handleOrderSn;
+
+
+	@ApiModelProperty("机构ID")
+	private String tenantId;
+
+
+}

zhongzheng-system/src/main/resources/mapper/modules/order/OrderHandleMapper.xml

@@ -173,4 +173,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND og.refund_status = #{refundStatus}
             </if>
     </select>
+
+    <select id="selectOverTimeOrderList" parameterType="com.zhongzheng.modules.order.bo.OrderHandleQueryBo" resultType="com.zhongzheng.modules.order.vo.OrderHandleOverVo">
+        SELECT oh.*
+        FROM
+        order_handle oh
+        where 1=1 and oh.pay_status = 0 and  #{overTime} > oh.over_time
+    </select>
 </mapper>