Merge branch 'refs/heads/dev'

This commit is contained in:
GYJ 2024-07-06 20:23:36 +08:00
commit 2810d83dc1
1 changed files with 7 additions and 2 deletions

View File

@ -455,8 +455,8 @@ public class CartService {
product.setStockNumber(0);
}
if (
(product.getIsDistribute() == 1 && product.getStockNumber() <= productSku.getWarnLine())
|| (product.getIsDistribute() != 1) && productSku.getStockNumber() <= productSku.getWarnLine()
(product.getIsDistribute() == 1 && product.getStockNumber() - num <= productSku.getWarnLine())
|| (product.getIsDistribute() != 1) && productSku.getStockNumber() - num <= productSku.getWarnLine()
) {
List<TbShopOpenId> shopOpenIds = shopOpenIdMapper.selectByShopId(Integer.valueOf(product.getShopId()));
shopOpenIds.forEach(item -> {
@ -560,6 +560,11 @@ public class CartService {
TbCashierCart cashierCart = JSONUtil.parseJSONStr2T(object.toJSONString(), TbCashierCart.class);
TbProductSkuWithBLOBs tbProduct = productSkuMapper.selectByPrimaryKey(Integer.valueOf(cashierCart.getSkuId()));
TbProduct tbProduct1 = tbProductMapper.selectById(Integer.valueOf(tbProduct.getProductId()));
log.info("下单,开始校验库存预警,购物车id:{}", cashierCart.getId());
CompletableFuture.runAsync(() -> checkWarnLineAndSendMsg(tbProduct, tbProduct1, cashierCart.getNumber()));
log.info("开始修改库存商品id{},商品名:{}", tbProduct1.getId(), tbProduct1.getName());
// 修改库存
try {