Merge branch 'ww' into test

# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java

@@ -32,6 +32,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
 import javax.servlet.http.HttpServletResponse;
 
 @Service
@@ -243,15 +244,20 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
 
     @Override
     public void addSaleRecord(Integer orderId) {
-        List<StockCountDTO> stockCountDTOS = stockCountRepository.countStockById(orderId);
+        // 先进行延迟
+        CompletableFuture<Void> delayFuture = CompletableFuture.runAsync(() -> {
             try {
-            Thread.sleep(3000l);
+                Thread.sleep(3000L);
             } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
                 throw new RuntimeException(e);
             }
+        });
+
+        delayFuture.thenRun(() -> {
+            List<StockCountDTO> stockCountDTOS = stockCountRepository.countStockById(orderId);
             log.info("查询到订单id: {}的所有库存数据: {}", orderId, stockCountDTOS);
             stockCountDTOS.forEach(s -> {
-            //客座费不统计
                 if (s.getProId() > 0) {
                     if (s.getStockCount() > 0) {
                         TbProductStockDetail productStockDetail = new TbProductStockDetail();
@@ -276,6 +282,7 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
                     skutMapper.incrRealSalesNumber(s.getSkuId().intValue(), s.getStockCount());
                 }
             });
+        });
     }
 
 }