fix: 订单显示待支付，收款显示已支付

fs-admin/src/main/java/com/fs/task/PaymentTask.java

@@ -1,6 +1,7 @@
 package com.fs.task;
 
 import com.fs.common.annotation.QuartzRunnable;
+import com.fs.store.service.IFsStoreOrderService;
 import com.fs.store.service.IFsStorePaymentService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +12,8 @@ import org.springframework.stereotype.Service;
 public class PaymentTask {
     @Autowired
     private IFsStorePaymentService fsStorePaymentService;
+    @Autowired
+    private IFsStoreOrderService fsStoreOrderService;
 
     /**
      * 补偿机制，定时反查台州银行
@@ -19,4 +22,11 @@ public class PaymentTask {
     public void paymentSync() {
         fsStorePaymentService.paymentSync();
     }
+
+    /**
+     * 超时订单自动取消
+     */
+    public void orderCancel(){
+        fsStoreOrderService.orderCancel();
+    }
 }

fs-service-system/src/main/java/com/fs/store/service/IFsStoreOrderService.java

@@ -280,4 +280,9 @@ public interface IFsStoreOrderService
      * @return R
      */
     R finishStoreOrder(Long orderId);
+
+    void orderCancel();
+
+    List<FsStoreOrder> selectFsOutDateOrder();
+
 }

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -1582,6 +1582,22 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         }
     }
 
+    @Override
+    public void orderCancel() {
+        List<FsStoreOrder> fsStoreOrders = orderService.selectFsOutDateOrder();
+
+        if (fsStoreOrders.size() > 0) {
+            for (FsStoreOrder order : fsStoreOrders) {
+                orderService.cancelOrder(order.getId());
+            }
+        }
+    }
+
+    @Override
+    public List<FsStoreOrder> selectFsOutDateOrder() {
+        return Collections.emptyList();
+    }
+
     @Override
     @Transactional(rollbackFor = Throwable.class,propagation = Propagation.REQUIRED)
     //类型1支付回调 类型2货到付款