czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ww' into test

Browse Source 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
This commit is contained in:
wangw
2024-10-14 15:30:07 +08:00
parent f87a2747bc 68fac45b7a
commit da9a1dc3b8
1 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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