修改 消费 逻辑

# Conflicts:
#	liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinRedisConst.java
#	liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/MybatisPlusCodeGenerator.java
#	liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinNftGoodsAppServiceImpl.java
#	liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java
#	liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java
#	liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinNftOrderServiceImpl.java

Pre

See merge request !229

Fix220511 consumer kylin

See merge request !228

This reverts commit e9de3da6

修改 入场人 添加和编辑 从三要素更改为二要素

See merge request !227

Pre

See merge request !226

增加 上个时间段 库存未售罄的库存
增加 getCollectByNowNext 根据时间获取当前分段购vo 如果当前没有返回下一个
增加 getListCanBuy 获取是否可分段购买
修改 skuVo详情 如果当前时间段未到分段购则返回下一个分段购的标签

增加 上个时间段 库存未售罄的库存

# Conflicts:
#	liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinRedisUtils.java

增加 上个时间段 库存未售罄的库存