Merge remote-tracking branch 'origin/master-v2' into master-v2

cloudroam

2024-09-11 aa411422f009e2d99ecd6c2bf6aaa75eb1416d2e

 src/main/java/com/mzl/flower/service/point/PointGoodsService.java

@@ -114,6 +114,12 @@
                    continue;
                }

                if(Constants.POINT_GOODS_STATUS.A.name().equals(status)){
                    if(p.getStock() == null || p.getStock() <= 0){
                        throw new ValidationException("商品" + p.getName() + "库存为0不能上架");
                    }
                }

                p.setStatus(status);
                p.update(SecurityUtils.getUserId());
                pointGoodsMapper.updateById(p);