修改vo

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

@@ -122,8 +122,8 @@ public class GoblinFrontController {
         return ResponseDto.success( goblinFrontService.getStoreGoodes(storeId,categoryId,name));
     }
     @GetMapping("searchGoodesName")
-    @ApiOperation("搜索商品名字")
-    public ResponseDto<List<GoblinGoodsInfoVo>> searchGoodesName(@RequestParam(name = "name", required = true)String name) throws ParseException {
+    @ApiOperation("搜索商品名字、或商铺名字")
+    public ResponseDto<List<GoblinGoodsInfoListVo>> searchGoodesName(@RequestParam(name = "name", required = true)String name) throws ParseException {
         if(StringUtil.isNotBlank(name)){
             return ResponseDto.success( goblinFrontService.searchGoodesName(name));
         }

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

@@ -401,7 +401,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         return goblinCategoryzfVo;
 
     }
-    public List<GoblinGoodsInfoVo> searchGoodesName(String name){
+    public List<GoblinGoodsInfoListVo> searchGoodesName(String name){
         List<String> listStore=mongoUtils.getStoreInfoVoRegexName(name);
         Pattern pattern = Pattern.compile("^.*"+name+".*$", Pattern.CASE_INSENSITIVE);
         Query query = new Query();
@@ -416,25 +416,31 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                 Sort.Order.desc("createdAt")
         ));
         List<GoblinGoodsInfoVo> list = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
-        ArrayList<GoblinGoodsInfoVo> list1=ObjectUtil.goblinGoodsInfoVoArrayList();
+        ArrayList<GoblinGoodsInfoListVo> list1=ObjectUtil.getGoblinGoodsInfoListVo();
         //遍历
         for(GoblinGoodsInfoVo goblinGoodsInfoVo:list){
+            //有音乐人的放前面
             if(null!=goblinGoodsInfoVo.getExtagVoList()&&goblinGoodsInfoVo.getExtagVoList().size()>0){
                 GoblinStoreInfoVo goblinStoreInfoVo=goblinRedisUtils.getStoreInfoVo(goblinGoodsInfoVo.getStoreId());
                 if(null!=goblinStoreInfoVo){
                     goblinGoodsInfoVo.setStoreName(goblinStoreInfoVo.getStoreName());
                 }
-                list1.add(goblinGoodsInfoVo);
+                GoblinGoodsInfoListVo goblinGoodsInfoListVo= GoblinGoodsInfoListVo.getNew();
+                BeanUtils.copyProperties(goblinGoodsInfoVo,goblinGoodsInfoListVo);
+                list1.add(goblinGoodsInfoListVo);
             }
         }
         for(GoblinGoodsInfoVo goblinGoodsInfoVo:list){
             if(null!=goblinGoodsInfoVo.getExtagVoList()&&goblinGoodsInfoVo.getExtagVoList().size()>0){
             }else{
+                //无音乐人标签的
                 GoblinStoreInfoVo goblinStoreInfoVo=goblinRedisUtils.getStoreInfoVo(goblinGoodsInfoVo.getStoreId());
                 if(null!=goblinStoreInfoVo){
                     goblinGoodsInfoVo.setStoreName(goblinStoreInfoVo.getStoreName());
                 }
-                list1.add(goblinGoodsInfoVo);
+                GoblinGoodsInfoListVo goblinGoodsInfoListVo= GoblinGoodsInfoListVo.getNew();
+                BeanUtils.copyProperties(goblinGoodsInfoVo,goblinGoodsInfoListVo);
+                list1.add(goblinGoodsInfoListVo);
             }
         }
         return list1;