update

src/main/java/com/example/afrishop_v3/AfrishopV3Application.java

@@ -4,7 +4,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
+@EnableScheduling
 @SpringBootApplication
 public class AfrishopV3Application {
     private static Logger logger = LoggerFactory.getLogger(AfrishopV3Application.class);

src/main/java/com/example/afrishop_v3/controllers/ItemController.java

@@ -192,13 +192,15 @@ public class ItemController {
         //商品参数
         List<TbCfItemParam> itemParamList = itemParamRepository.findAllByItemId(itemId);
 
+        //商品详情
+        Optional<TbCfItemDesc> byId = descRepository.findById(itemId);
         map.put("score",item.getTotalScore());
         map.put("isCollection",userId != null && !userId.isEmpty() && collectionRepository.existsByUserIdAndItemItemId(userId,itemId));
         map.put("optionList",categoryList);
         map.put("itemDetail",skusList);
         map.put("itemInfo", item);
         map.put("itemParam", itemParamList);
-        map.put("itemDesc",descRepository.findById(itemId));
+        map.put("itemDesc",byId.orElse(new TbCfItemDesc()));
 
         return new Result<>(map);
     }

src/main/java/com/example/afrishop_v3/models/TbCfOrder.java

@@ -182,7 +182,7 @@ public class TbCfOrder {
         this.commentCount = commentCount;
     }
 
-    @OneToMany(mappedBy = "orderId", cascade = CascadeType.ALL)
+    @OneToMany(mappedBy = "orderId", cascade = CascadeType.ALL,fetch = FetchType.EAGER)
     private List<TbCfItemOrderR> itemOrderList = new ArrayList<>();
 
 

src/main/java/com/example/afrishop_v3/quartz/OrderTask.java

@@ -42,7 +42,6 @@ public class OrderTask {
     private final TbCfAddressRepository addressRepository;
 
 
-
     private final TbCfItemSkuRepository itemSkuRepository;
 
     private final TbCfStationItemRepository stationItemRepository;
@@ -86,7 +85,7 @@ public class OrderTask {
     /**
      * 将超时（24小时）未付款的订单释放库存
      */
-    @Scheduled(cron = "0 0 0-23 * * ?")
+    @Scheduled(cron = "0 0/10 * * * ? ")
     public void orderReleaseStock() throws ExecutionException, InterruptedException {
 
         ExecutorService executorService = Executors.newFixedThreadPool(20);
@@ -97,9 +96,11 @@ public class OrderTask {
             cal.setTime(new Date());
             cal.add(Calendar.DATE, -1);
             Date realDate = cal.getTime();
-            Future<List<TbCfOrder>> orders = executorService.submit(() -> orderRepository.findAllByOrderTimeLessThanAndOrderStatus(realDate,10));
+            Future<List<TbCfOrder>> orders = executorService.submit(() ->
+                    orderRepository.findAllByOrderTimeLessThanAndOrderStatus(realDate, 10));
 
             orderList = orders.get();
+            System.err.println(orderList);
         }
 
         for (TbCfOrder order : orderList) {
@@ -111,10 +112,20 @@ public class OrderTask {
             for (TbCfItemOrderR orderDetail : orderDetailList) {
                 orderDetail.setOrderStatus(OrderStatusEnum.CLOSE.getValue());
                 itemOrderRepository.save(orderDetail);
+                logger.info("商品释放库存。。。");
                 //释放库存
                 Optional<TbCfItemSkus> skuOptional = itemSkuRepository.findFirstByItemId(orderDetail.getItemId());
                 if (skuOptional.isPresent()) {
+
                     TbCfItemSkus item = skuOptional.get();
+                    Optional<TbCfStationItem> byId = stationItemRepository.findById(orderDetail.getItemId());
+                    System.out.println("释放数量：" + orderDetail.getItemNum());
+                    if (byId.isPresent()) {
+                        TbCfStationItem tbCfStationItem = byId.get();
+                        System.out.println("商品库存：" + tbCfStationItem.getItemCount());
+                        tbCfStationItem.setItemCount(tbCfStationItem.getItemCount() + orderDetail.getItemNum());
+                    }
+                    System.out.println("商品sku库存：" + item.getSkuCount());
                     item.setSkuCount(item.getSkuCount() + orderDetail.getItemNum());
                     itemSkuRepository.save(item);
                 }
@@ -165,14 +176,14 @@ public class OrderTask {
             //查询用户信息
             Optional<TbCfOrder> orderOptional = orderRepository.findById(platformOrder.getOrderId());
 
-                if( !orderOptional.isPresent()) return;
+            if (!orderOptional.isPresent()) return;
 
             TbCfOrder order = orderOptional.get();
 
 
             Optional<TbCfUserInfo> userInfoOptional = userRepository.findById(order.getUserId());
 
-                if( !userInfoOptional.isPresent() ) return;
+            if (!userInfoOptional.isPresent()) return;
 
             TbCfUserInfo user = userInfoOptional.get();