修改生成盲盒库存逻辑

liquidnet-bus-config/liquidnet-config/liquidnet-service-platform-dev.yml

@@ -14,9 +14,9 @@ liquidnet:
 #  rabbitmq:
 #    connection-timeout: 5000
   mysql:
-    database-name: dev_ln_scene
+    database-name: test_ln_scene
   mongodb:
     sslEnabled: false
-    database: dev_ln_scene
+    database: test_ln_scene
 
 #以下为spring各环境个性配置

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

@@ -220,9 +220,19 @@ public class GoblinListServiceImpl implements IGoblinListService {
                 BigDecimal hitRatioCount = new BigDecimal(0);
                 for (String itemSkuId : spuInfoVo.getSkuIdList()) {
                     GoblinGoodsSkuInfoVo skuItemVo = redisUtils.getGoodsSkuInfoVo(itemSkuId);
-//                    if (skuItemVo.getUnbox().equals("0")) {
-//                        map.put(skuItemVo.getSkuId(), skuItemVo.getHitRatio());
-//                    }
+                    if (skuItemVo.getUnbox().equals("1")) {
+                        continue;
+                    }
+
+                    // 判断开售、停售时间
+                    LocalDateTime saleStartTime = skuItemVo.getSaleStartTime();
+                    LocalDateTime saleStopTime = skuItemVo.getSaleStopTime();
+                    LocalDateTime nowTime = LocalDateTime.now();
+                    if (nowTime.isBefore(saleStartTime)) {
+                        continue;
+                    } else if (null != saleStopTime && nowTime.isAfter(saleStopTime)) {
+                        continue;
+                    }
 
                     //是否购买
                     if (!skuItemVo.getSkuCanbuy().equals("1")) {
@@ -239,6 +249,7 @@ public class GoblinListServiceImpl implements IGoblinListService {
                         map.put(skuItemVo.getSkuId(), skuItemVo.getHitRatio());
 //                        checkNumberSku++;
                     }
+                }
 //                    if (checkNumberSku <= 0) {
 //                        return ResponseDto.failure("盲盒下没有可生成兑换码的sku!");
 //                    }
@@ -246,9 +257,8 @@ public class GoblinListServiceImpl implements IGoblinListService {
 //                    if (countStockNumber < stockNumber) {
 //                        ResponseDto.failure("配置库存大于sku总库存!");
 //                    }
-                    if (isHit && hitRatioCount.doubleValue() < 100.00 && map.size() > 0) {
-                        nftBoxUtils.arrangeHitRatioMap(map, hitRatioCount);
-                    }
+                if (isHit && hitRatioCount.doubleValue() < 100.00 && map.size() > 0) {
+                    nftBoxUtils.arrangeHitRatioMap(map, hitRatioCount);
                 }
                 Map<String, Integer> skuMap = nftBoxUtils.getSkuHitRatio(item.getSkuStock(), map);
                 for (String key : skuMap.keySet()) {