diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index 9a8d07d..ebd9751 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -279,19 +279,23 @@ public class OrderService { return Result.fail(CodeEnum.CARTEXIST); } - - TbProductSkuWithBLOBs skuWithBLOBs= tbProductSkuMapper.selectByPrimaryKey(Integer.valueOf(cashierCart.getSkuId())); - if(ObjectUtil.isEmpty(skuWithBLOBs)){ - return Result.fail(CodeEnum.PRODUCTSKUERROR); + TbProductWithBLOBs product= tbProductMapper.selectByPrimaryKey(Integer.valueOf(cashierCart.getProductId())); + if(ObjectUtil.isEmpty(product)){ + return Result.fail(CodeEnum.PRODUCTINFOERROR); + } + if("1".equals(product.getIsStock().toString())){ + TbProductSkuWithBLOBs skuWithBLOBs= tbProductSkuMapper.selectByPrimaryKey(Integer.valueOf(cashierCart.getSkuId())); + if(ObjectUtil.isEmpty(skuWithBLOBs)){ + return Result.fail(CodeEnum.PRODUCTSKUERROR); + } + skuWithBLOBs.setStockNumber(skuWithBLOBs.getStockNumber()+cashierCart.getTotalNumber()); + skuWithBLOBs.setUpdatedAt(System.currentTimeMillis()); + tbProductSkuMapper.updateByPrimaryKey(skuWithBLOBs); } cashierCartMapper.deleteByCartId(masterId, cartId); - skuWithBLOBs.setStockNumber(skuWithBLOBs.getStockNumber()+cashierCart.getTotalNumber()); - skuWithBLOBs.setUpdatedAt(System.currentTimeMillis()); - tbProductSkuMapper.updateByPrimaryKey(skuWithBLOBs); - return Result.success(CodeEnum.SUCCESS); } @@ -650,8 +654,11 @@ public class OrderService { if (StringUtils.isNotEmpty(cashierCart.getOrderId())) { orderId = Integer.valueOf(cashierCart.getOrderId()); } - ProductSkuPo skuPo=new ProductSkuPo(Integer.valueOf(cashierCart.getSkuId()),cashierCart.getTotalNumber()); - productSkuPos.add(skuPo); + TbProductWithBLOBs product= tbProductMapper.selectByPrimaryKey(Integer.valueOf(cashierCart.getProductId())); + if(ObjectUtil.isNotEmpty(product)&&"1".equals(product.getIsStock().toString())){ + ProductSkuPo skuPo=new ProductSkuPo(Integer.valueOf(cashierCart.getSkuId()),cashierCart.getTotalNumber()); + productSkuPos.add(skuPo); + } } if (orderId > 0) { diff --git a/src/main/resources/mapper/TbProductSkuMapper.xml b/src/main/resources/mapper/TbProductSkuMapper.xml index e97e4fb..42cdd9f 100644 --- a/src/main/resources/mapper/TbProductSkuMapper.xml +++ b/src/main/resources/mapper/TbProductSkuMapper.xml @@ -359,7 +359,7 @@ update tb_product_sku - set stock_number= stock_number+ #{item.number}, + set stock_number= stock_number+ #{item.number} where id = #{item.skuId}