Merge branch 'master' into dev-dragon0518

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

@@ -353,7 +353,7 @@ public class GoblinStoreMgtGoodsImportService {
     private GoblinGoodsInfoVo goodsInformationDataAnalysisProcessingForSpu(GoblinGoodsImportDto dt, String uid, String storeId, LocalDateTime now) {
         GoblinGoodsInfoVo lastGoodsInfoVo = GoblinGoodsInfoVo.getNew();
         lastGoodsInfoVo.setName(dt.getSpuName());//*
-        lastGoodsInfoVo.setSpuId(IDGenerator.nextMilliId2());//*
+        lastGoodsInfoVo.setSpuId(IDGenerator.nextSnowId());//*
         if (StringUtils.isNotEmpty(dt.getSpuCode())) {
             lastGoodsInfoVo.setSpuNo(dt.getSpuCode());
         } else {

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

@@ -1336,6 +1336,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
                 goblinRedisUtils.delGoodsSkuInfoVo(skuId);
                 goblinRedisUtils.delGoodsSkuInfoVoByUnShelves(skuId);
             });
+            goblinMongoUtils.delGoodsSkuInfoVo(skuIdList, uid, now);
 
             LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
             toMqSqls.add(SqlMapping.get("goblin_goods.update_by_del"));

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

@@ -283,7 +283,7 @@ public class GoblinMongoUtils {
     public List<GoblinSelfTagVo> getSelfTagVos(String keyword, String belong, Object[] typeRange) {
         Criteria criteria = Criteria.where("delFlg").is("0").and("tagBelong").is(belong);
         if (StringUtils.isNotBlank(keyword)) {
-            criteria.and("tagName").regex("^.*" + keyword + ".*$");
+            criteria.and("tagName").regex("^.*" + keyword + ".*$", "i");
         }
         if (belong.equals("1")) {
             criteria.and("tagType").in(typeRange);
@@ -603,7 +603,7 @@ public class GoblinMongoUtils {
         if (count <= 0) return pagedResult;
 
         query.with(PageRequest.of(filterParam.getPageNum() - 1, filterParam.getPageSize()));
-        query.with(Sort.by(Sort.Order.desc("createdAt")));
+        query.with(Sort.by(Sort.Order.desc("createdAt"), Sort.Order.desc("spuId")));
 
         List<GoblinStoreMgtGoodsListVo> goodsListVos = mongoTemplate.find(query, GoblinStoreMgtGoodsListVo.class, GoblinGoodsInfoVo.class.getSimpleName());