Merge remote-tracking branch 'origin/hjc_goblin_list_fix' into hjc_goblin_list_fix

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftGoodsSkuInfoVo.java

@@ -100,6 +100,8 @@ public class GoblinNftGoodsSkuInfoVo implements Serializable, Cloneable {
     private String arUrlAndroid;
     @ApiModelProperty(position = 67, value = "标签[0-提前购买|1-分段购买]")
     private Integer tagType;
+    @ApiModelProperty(position = 68, value = "分批购活动id")
+    private String listId;
 
     private static final GoblinNftGoodsSkuInfoVo obj = new GoblinNftGoodsSkuInfoVo();
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinNftGoodsAppServiceImpl.java

@@ -175,6 +175,7 @@ public class GoblinNftGoodsAppServiceImpl implements IGoblinNftGoodsAppService {
             // 系统时间
             nftGoodsSkuInfoVo.setSystime(LocalDateTime.now());
             nftGoodsSkuInfoVo.setTagType(tagType);
+            nftGoodsSkuInfoVo.setListId(listId);
             // 是否开启兑换
             nftGoodsSkuInfoVo.setIsExchange(goblinRedisUtils.getIsExchange(skuId));
             return nftGoodsSkuInfoVo;

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinNftOrderServiceImpl.java

@@ -74,11 +74,6 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                     return ResponseDto.failure("您还未开通数字账户～");
                 }
 
-                // 若开启了预约 判断用户是否预约
-                boolean userAboutAut = nftOrderUtils.getUserAboutAut(payParam.getSkuId(), uid);
-                if (!userAboutAut) {
-                    return ResponseDto.failure("此数字藏品仅限预约用户购买～");
-                }
 
                 // 基础参数
                 String mobile = StringUtils.defaultString(((String) CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_MOBILE)), "");
@@ -91,6 +86,14 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                 String listId = (String) map.get("listId");
                 Integer whiteType = (Integer) map.get("whiteType");
 
+                // 若没有分批购 若开启了预约 判断用户是否预约
+                if (null == listId) {
+                    boolean userAboutAut = nftOrderUtils.getUserAboutAut(payParam.getSkuId(), uid);
+                    if (!userAboutAut) {
+                        return ResponseDto.failure("此数字藏品仅限预约用户购买～");
+                    }
+                }
+
                 // 分批、提前购黑、白名单
                 if (null != listId) {
                     Boolean listCanBuy = goblinRedisUtils.getListCanBuy(listId, skuId, mobile, uid, whiteType);
@@ -344,7 +347,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
             GoblinNftOrderPayParam payParam, String storeId, String uid, String spuId, int number,
             String orderId, String orderCode,
             BigDecimal totalPrice, BigDecimal voucherPrice, BigDecimal storeVoucherPrice, String boxSkuId, String skuTitle
-            ,int orderType
+            , int orderType
     ) {
         try {
             LocalDateTime now = LocalDateTime.now();