xdd

fs-service-system/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -1716,7 +1716,11 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
 
         List<LiveOrder> fsStoreOrders = liveOrderMapper.selectFsOutDateOrder();
         for (LiveOrder order : fsStoreOrders) {
-            this.cancelOrder(order);
+            try{
+                this.cancelOrder(order);
+            }catch (Exception e){
+                log.error("直播超时订单结束失败！",e);
+            }
         }
     }
 
@@ -2327,9 +2331,9 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
 
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public R cancelOrder(LiveOrder order) {
-        if(order.getStatus() == 2){
+        if(order.getStatus() == 1){
             LiveOrder liveOrder = baseMapper.selectLiveOrderByOrderId(String.valueOf(order.getOrderId()));
             if(liveOrder == null) return R.error("订单不存在");
             baseMapper.cancelOrder(order.getOrderId());

fs-service-system/src/main/resources/mapper/live/LiveOrderMapper.xml

@@ -442,7 +442,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectFsOutDateOrder" resultType="com.fs.live.domain.LiveOrder">
         <![CDATA[
-        SELECT order_id
+        SELECT *
         FROM live_order
         WHERE status = 1
         AND create_time < DATE_SUB(NOW(), INTERVAL 1800 MINUTE)