秒杀商品

ruoyi-shop/src/main/java/com/ruoyi/shop/product/service/impl/ProductSkuSetServiceImpl.java

@@ -218,7 +218,7 @@ public class ProductSkuSetServiceImpl implements IProductSkuSetService {
                 .eq(UserShoppingCart::getProductId, productSkuSetBo.getProductId())
                 .eq(UserShoppingCart::getSkuHashCode, productSkuSetBo.getSkuHashCode())
                 .set(UserShoppingCart::getSalePrice, productSkuSetBo.getSalePrice())
-                .set(UserShoppingCart::getPoint, productSkuSetBo.getExchangePoint())
+                .set(ObjectUtil.isNotNull(productSkuSetBo.getExchangePoint()), UserShoppingCart::getPoint, productSkuSetBo.getExchangePoint())
             );
         }
     }

ruoyi-shop/src/main/java/com/ruoyi/shop/product/service/impl/ProductSkuSetStockServiceImpl.java

@@ -169,15 +169,13 @@ public class ProductSkuSetStockServiceImpl implements IProductSkuSetStockService
         if (ObjectUtil.isNull(originalProductSkuSetStock)) {
             throw new ServiceException(ProductSkuSetStockExceptionEnum.ProductSkuSetStock_IS_NOT_EXISTS);
         }
-        activityProductSkuStockBo.setId(originalProductSkuSetStock.getId());
+        ProductSkuSetStockBo originalProductSkuSetStockBo = BeanUtil.toBean(originalProductSkuSetStock, ProductSkuSetStockBo.class);
         if(originalProductSkuSetStock.getStock() < activityProductSkuStockBo.getStock()){
             throw new ServiceException(String.format("原商品sku[%s]的库存不足",productStockFlowWaterBo.getSkuSetName()),ProductSkuSetStockExceptionEnum.ProductSkuSetStock_STOCK_NOT_ENOUGH.getCode());
         }
-        activityProductSkuStockBo.setStock(originalProductSkuSetStock.getStock() - activityProductSkuStockBo.getStock());
-        activityProductSkuStockBo.setStockFlowWaterType(StockFlowWater.DROP_ACTIVITY_PRODUCT_STOCK);
-        activityProductSkuStockBo.setActivityId(0L);
-        activityProductSkuStockBo.setActivityProductId(0L);
-        this.updateByBo(activityProductSkuStockBo);
+        originalProductSkuSetStockBo.setStock(originalProductSkuSetStock.getStock() - activityProductSkuStockBo.getStock());
+        originalProductSkuSetStockBo.setStockFlowWaterType(StockFlowWater.DROP_ACTIVITY_PRODUCT_STOCK);
+        this.updateByBo(originalProductSkuSetStockBo);
         return flag;
     }