~api:藏品管理:添加盲盒+校验；

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreMgtGoodsController.java

@@ -1087,25 +1087,7 @@ public class GoblinStoreMgtGoodsController {
             return ResponseDto.failure(ErrorMapping.get("149010"));
         }
         if (goodsInfoVo.getSpuType() == 0) {
-            return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "无效操作，该商品非数字藏品");
-        }
-        if ("23".contains(mgtDigitalGoodsAddSkuParam.getWatchType())) {
-            if (StringUtils.isBlank(mgtDigitalGoodsAddSkuParam.getSkuWatchPic())) {
-                return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "展示预览图不能为空");
-            }
-        } else {
-            mgtDigitalGoodsAddSkuParam.setSkuWatchPic(null);
-        }
-        BigDecimal hitRatio = mgtDigitalGoodsAddSkuParam.getHitRatio();
-        if (null != hitRatio && hitRatio.scale() > 2) {
-            return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "概率值只支持小数点后两位");
-        }
-        if (goblinMongoUtils.countMgtGoodsSkuInfoVo(mgtDigitalGoodsAddSkuParam.getName(), 1) > 0) {
-            return ResponseDto.failure(ErrorMapping.get("149018"));
-        }
-        JsonNode priceVNode = goblinRedisUtils.getIosProducts().get(mgtDigitalGoodsAddSkuParam.getProductId());
-        if (null == priceVNode) {
-            return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "无效的IOS商品ID");
+            return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "该商品非数字藏品");
         }
         String unbox = mgtDigitalGoodsAddSkuParam.getUnbox();
         boolean notUnboxFlg = StringUtils.isEmpty(unbox) || unbox.equals("0");
@@ -1132,10 +1114,31 @@ public class GoblinStoreMgtGoodsController {
 //                }
 //            }
         } else {// 盲盒校验
+            if (CollectionUtils.isEmpty(goodsInfoVo.getSkuIdList())) {
+                return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "请先添加SKU");
+            }
             if (StringUtils.isEmpty(mgtDigitalGoodsAddSkuParam.getOpeningTime())) {
                 return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "盲盒开启时间不能为空");
             }
         }
+        if ("23".contains(mgtDigitalGoodsAddSkuParam.getWatchType())) {
+            if (StringUtils.isBlank(mgtDigitalGoodsAddSkuParam.getSkuWatchPic())) {
+                return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "展示预览图不能为空");
+            }
+        } else {
+            mgtDigitalGoodsAddSkuParam.setSkuWatchPic(null);
+        }
+        BigDecimal hitRatio = mgtDigitalGoodsAddSkuParam.getHitRatio();
+        if (null != hitRatio && hitRatio.scale() > 2) {
+            return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "概率值只支持小数点后两位");
+        }
+        if (goblinMongoUtils.countMgtGoodsSkuInfoVo(mgtDigitalGoodsAddSkuParam.getName(), 1) > 0) {
+            return ResponseDto.failure(ErrorMapping.get("149018"));
+        }
+        JsonNode priceVNode = goblinRedisUtils.getIosProducts().get(mgtDigitalGoodsAddSkuParam.getProductId());
+        if (null == priceVNode) {
+            return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "无效的IOS商品ID");
+        }
         if ("3".equals(mgtDigitalGoodsAddSkuParam.getShelvesHandle()) && StringUtils.isEmpty(mgtDigitalGoodsAddSkuParam.getShelvesTime())) {
             return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "请指定预约上架时间");
         }