nft预下单分批够黑白名单

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

@@ -56,7 +56,7 @@ public class GoblinNftOrderAppController {
     ) {
         GoblinPayOrderDetailsVo vo = goblinNftOrderAppService.payOrderDetails(skuId);
         if (vo == null) {
-            return ResponseDto.failure("获取失败");
+            return ResponseDto.failure("商品不存在或无权购买");
         }
         return ResponseDto.success(vo);
     }

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

@@ -8,9 +8,12 @@ import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.service.IGoblinNftOrderAppService;
 import com.liquidnet.service.goblin.util.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
 
 @Service
@@ -83,7 +86,22 @@ public class GoblinNftOrderAppServiceImpl implements IGoblinNftOrderAppService {
 
     @Override
     public GoblinPayOrderDetailsVo payOrderDetails(String skuId) {
-        GoblinGoodsSkuInfoVo goodsSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(skuId);
+        String uid = CurrentUtil.getCurrentUid();
+        String mobile = StringUtils.defaultString(((String) CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_MOBILE)), "");
+        LocalDateTime nowTime = LocalDateTime.now();
+        HashMap<String, Object> map = goblinRedisUtils.getGoodsSkuInfoVo(nowTime, skuId);
+        GoblinGoodsSkuInfoVo goodsSkuInfoVo = (GoblinGoodsSkuInfoVo) map.get("vo");
+        Object tagType = map.get("tagType");
+        String listId = (String) map.get("listId");
+
+        // 分批、提前购黑、白名单
+        if (null != tagType) {
+            Boolean listCanBuy = goblinRedisUtils.getListCanBuy(listId, skuId, mobile, uid, null);
+            if (!listCanBuy) {
+                return null;
+            }
+        }
+
         if (goblinRedisUtils.getSkuAllStatusShow(goodsSkuInfoVo)) {
             GoblinPayOrderDetailsVo payOrderDetailsVo = GoblinPayOrderDetailsVo.getNew().copy(goodsSkuInfoVo);
             payOrderDetailsVo.setNum(1);