Merge branch 'dev' into 'test'

mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/service/impl/SpuServiceImpl.java

@@ -42,6 +42,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static com.fzm.mall.server.admin.goods_center.enums.type.GoodsTypeEnum.*;
@@ -135,7 +136,9 @@ public class SpuServiceImpl extends ServiceImpl<SpuMapper, Spu> implements ISpuS
         spu = beanMapper.map(pDTO, Spu.class);
         spu.setGoodsId(goodsId);
         spu.setMerchantId(merchantId);
-        spu.setBlindBoxRule("无");
+        if (!Objects.equals(spu.getSalesType(), SalesTypeEnum.BLIND_BOX.getType())){
+            spu.setBlindBoxRule("无");
+        }
         Integer status = SpuStatusEnum.WAIT_CHECK.getStatus();
         if ((pDTO.getCommodityPass().equals(CommodityPassTypeEnum.COPY.getType()) && pDTO.getSkuList().get(0).getNftSalesType().equals(NFTSalesTypeEnum.COPY.getType())) || pDTO.getCommodityPass().equals(CommodityPassTypeEnum.INNER.getType())) {
             status = SpuStatusEnum.ISSUE.getStatus();