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

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

@@ -81,6 +81,8 @@ public class GoblinFrontCubeVo implements Serializable {
     private LocalDateTime createTime;
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateUtil.DATE_FULL_STR)
     private LocalDateTime updateTime;
+    //1魔方2新品推荐
+    private String type;
     /**
      * spu
      */

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinFrontCubeParam.java

@@ -90,6 +90,8 @@ public class GoblinFrontCubeParam implements Serializable {
      */
     @ApiModelProperty(value = "spu信息")
     private GoblinGoods goblinGoods;
+    //1魔方2新品推荐
+    private String type;
 
 
 }

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

@@ -77,6 +77,10 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
         goblinMongoUtils.setGoodsInfoVo(goodsInfoVo);
         goblinMongoUtils.setGoodsSkuInfoVos(goodsSkuInfoVoList);
 
+        if (goodsInfoVo.getShelvesHandle().equals("2")) {
+            goblinRedisUtils.deleteKeyForSelectGoods();// 精选商品:商品上架、下架、删除 调用的方法
+        }
+
         String createdBy = goodsInfoVo.getCreatedBy();
         LocalDateTime createdAt = goodsInfoVo.getCreatedAt();
         String spuId = goodsInfoVo.getSpuId();

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

@@ -80,7 +80,7 @@ public class GoblinStoreMgtServiceImpl implements IGoblinStoreMgtService {
                 goblinMongoUtils.updateStoreInfoVo(updateStoreInfoVo);
 //                goblinRedisUtils.setStoreInfoVo(updateStoreInfoVo);// TODO: 2022/1/17 zhanggb==redis
 
-                goblinMongoUtils.updateGoodsInfoVoAppear(storeId, status, now, uid);
+                goblinMongoUtils.updateGoodsInfoVoAppear(storeId, status.equals("4") ? "1" : "0", now, uid);
 
                 List<String> spuIdList = goblinMongoUtils.getMgtGoodsSpuIds(storeId);
                 spuIdList.forEach(spuId -> goblinRedisUtils.delGoodsInfoVo(spuId));

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

@@ -64,6 +64,11 @@ public class PlatformGoblinGoodsService extends ServiceImpl<GoblinGoodsMapper, G
                     if (updateSkuResult.getModifiedCount() > 0) {
                         AbstractRedisUtil redisGoblinUtil = redisDataSourceUtil.getRedisGoblinUtil();
 
+                        {// 精选商品:商品上架、下架、删除 调用的方法
+                            redisGoblinUtil.del(GoblinRedisConst.SELECT_GOODS_SPUIDS);
+                            redisGoblinUtil.del(GoblinRedisConst.SELECT_GOODS_PAGE1);
+                        }
+
                         Query query = Query.query(Criteria.where("delFlg").is("0").and("spuId").in(spuIdList));
                         query.fields().include("skuId");
                         List<GoblinGoodsSkuInfoVo> vos = mongoTemplate.find(query, GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());