Merge branch 'dev' into 'test'

优化 See merge request !33

Merge branch 'dev' into 'test'
258e5e44 · wangpeng · a732c79e · 05344c5a · 258e5e44
Commit 258e5e44 authored Mar 17, 2022 by wangpeng
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

SpuServiceImpl.java ...erver/admin/goods_center/service/impl/SpuServiceImpl.java +1 -1

No files found.
--- a/mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/service/impl/SpuServiceImpl.java
+++ b/mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/service/impl/SpuServiceImpl.java
@@ -141,7 +141,7 @@ public class SpuServiceImpl extends ServiceImpl<SpuMapper, Spu> implements ISpuS
        }
        spu.setStatus(status);
        //设置商品最大最小值
-        if (pDTO.getSalesType().equals(SalesTypeEnum.BLIND_BOX.getType())) {
+        if (pDTO.getSalesType() != null && pDTO.getSalesType().equals(SalesTypeEnum.BLIND_BOX.getType())) {
            spu.setMaxPrice(pDTO.getBlindBoxPrice());
            spu.setDefaultPrice(pDTO.getBlindBoxPrice());
        } else {