Merge branch 'dev-admin0526'

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@ApiModel(value = "GoblinGoodsInfoListVo", description = "商品SPU List")
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class GoblinGoodsInfoListVoo implements Serializable, Cloneable {
+   private List<GoblinGoodsInfoListVo> list;
+    @ApiModelProperty(position = 55, value = "数量")
+    private long count;
+    private static final GoblinGoodsInfoListVoo obj = new GoblinGoodsInfoListVoo();
+
+    public static GoblinGoodsInfoListVoo getNew() {
+        try {
+            return (GoblinGoodsInfoListVoo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinGoodsInfoListVoo();
+        }
+    }
+/*    public int compareTo(GoblinGoodsInfoVo arg0) {
+        return this.getCount().compareTo(arg0.getCount());
+    }*/
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinFrontCubeController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.zhengzai.goblin.service.impl.GoblinFrontCubeServiceImpl;
+import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.goblin.entity.GoblinFrontCube;
 import com.liquidnet.service.goblin.param.GoblinFrontCubeParam;
 import io.swagger.annotations.Api;
@@ -52,6 +53,9 @@ public class GoblinFrontCubeController  extends BaseController {
     public AjaxResult updateOrCreate(@RequestBody List<GoblinFrontCubeParam> list) {
         List<GoblinFrontCube> list1=new ArrayList<>();
         for(GoblinFrontCubeParam goblinFrontCubeParam:list){
+            if(StringUtil.isBlank(goblinFrontCubeParam.getSpuId())||goblinFrontCubeParam.getSpuId().equals("undefined")){
+                return  error("spuId必传，请填写");
+            }
             GoblinFrontCube goblinFrontCube=new GoblinFrontCube();
             BeanUtils.copyProperties(goblinFrontCubeParam,goblinFrontCube);
             list1.add(goblinFrontCube);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinFrontCubeServiceImpl.java

@@ -71,7 +71,7 @@ public class GoblinFrontCubeServiceImpl extends ServiceImpl<GoblinFrontCubeMappe
             } else {
                 goblinFrontCube.setUpdateTime(LocalDateTime.now());
                 //数据库修改
-                String spuIds="";
+                /*String spuIds="";
                 for(String spuId:goblinFrontCube.getSpuId().split(",")){
                     if(spuId.equals("")||spuId.equals("undefined")){
 
@@ -79,7 +79,7 @@ public class GoblinFrontCubeServiceImpl extends ServiceImpl<GoblinFrontCubeMappe
                         spuIds=spuIds.concat(spuId).concat(",");
                     }
                 }
-                goblinFrontCube.setSpuId(spuIds);
+                goblinFrontCube.setSpuId(spuIds);*/
                 goblinFrontCubeMapper.updateById(goblinFrontCube);
             }
         }
@@ -107,7 +107,9 @@ public class GoblinFrontCubeServiceImpl extends ServiceImpl<GoblinFrontCubeMappe
                 List<GoblinGoods> goodsList= goblinGoodsMapper.selectList(queryWrappers);
                 GoblinFrontCubeParam goblinFrontCubeParam=new GoblinFrontCubeParam();
                 BeanUtils.copyProperties(goblinFrontCube,goblinFrontCubeParam);
+                if(null!=goodsList&&goodsList.size()>0){
                     goblinFrontCubeParam.setGoblinGoods(goodsList.get(0));
+                }
                 list1.add(goblinFrontCubeParam);
             }
         }
@@ -139,6 +141,8 @@ public class GoblinFrontCubeServiceImpl extends ServiceImpl<GoblinFrontCubeMappe
             }
             //redis
             redisDataSourceUtil.getRedisGoblinUtil().set(GoblinRedisConst.FRONT_GOBLINFRONTCUBE,list);
+        }else{
+            redisDataSourceUtil.getRedisGoblinUtil().set(GoblinRedisConst.FRONT_GOBLINFRONTCUBE,list);
         }
 
         return true;
@@ -164,6 +168,8 @@ public class GoblinFrontCubeServiceImpl extends ServiceImpl<GoblinFrontCubeMappe
             }
             //redis
             redisDataSourceUtil.getRedisGoblinUtil().set(GoblinRedisConst.FRONT_GOBLIN_RECOMMEND,list);
+        }else{
+            redisDataSourceUtil.getRedisGoblinUtil().set(GoblinRedisConst.FRONT_GOBLIN_RECOMMEND,list);
         }
         return true;
     }

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

 package com.liquidnet.service.goblin.controller;
 
-import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.entity.GoblinFrontHotWord;
-import com.liquidnet.service.goblin.service.GoblinFrontService;
 import com.liquidnet.service.goblin.service.impl.GoblinFrontServiceImpl;
-import com.liquidnet.service.goblin.util.GoblinRedisUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -134,9 +131,9 @@ public class GoblinFrontController {
 
     @GetMapping("searchGoodesName")
     @ApiOperation("搜索商品名字、或商铺名字")
-    public ResponseDto<List<GoblinGoodsInfoListVo>> searchGoodesName(@RequestParam(name = "name", required = true) String name) throws ParseException {
+    public ResponseDto<GoblinGoodsInfoListVoo> searchGoodesName(@RequestParam(name = "name", required = true) String name,@RequestParam(name = "page", required = true) int page,@RequestParam(name = "pageSize", required = true) int pageSize) throws ParseException {
         if (StringUtil.isNotBlank(name)) {
-            return ResponseDto.success(goblinFrontService.searchGoodesName(name));
+            return ResponseDto.success(goblinFrontService.searchGoodesName(name,page,pageSize));
         }
         return ResponseDto.success(null);
     }

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

@@ -463,7 +463,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
 
     }
 
-    public List<GoblinGoodsInfoListVo> searchGoodesName(String name) {
+    public GoblinGoodsInfoListVoo searchGoodesName(String name,int page,int pageSize) {
         List<String> listStore = mongoUtils.getStoreInfoVoRegexName(name);
         Pattern pattern = Pattern.compile("^.*" + name + ".*$", Pattern.CASE_INSENSITIVE);
         Query query = new Query();
@@ -475,11 +475,15 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                 ),
                 new Criteria().orOperator(Criteria.where("spuType").exists(false), (Criteria.where("spuType").is(0)))
         ));
-        query.with(PageRequest.of(0, 20)).with(Sort.by(
+        long count = mongoTemplate.count(query, GoblinGoodsInfoVo.class.getSimpleName());
+        query.with(PageRequest.of(page, pageSize)).with(Sort.by(
                 //Sort.Order.desc("count"),
                 Sort.Order.desc("shelvesAt")
         ));
         List<GoblinGoodsInfoVo> list = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
+
+        GoblinGoodsInfoListVoo goblinGoodsInfoListVoo=GoblinGoodsInfoListVoo.getNew();
+        goblinGoodsInfoListVoo.setCount(count);
         ArrayList<GoblinGoodsInfoListVo> list1 = ObjectUtil.getGoblinGoodsInfoListVo();
         //遍历
         for (GoblinGoodsInfoVo goblinGoodsInfoVo : list) {
@@ -507,7 +511,9 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                 list1.add(goblinGoodsInfoListVo);
             }
         }
-        return list1;
+        goblinGoodsInfoListVoo.setList(list1);
+        return goblinGoodsInfoListVoo;
+        //return list1;
     }
 
     public GoblinFrontCategoryListVo getStoreGoodes(String storeId, String categoryId, String name) {