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/GoblinFrontBannerVo.java

@@ -104,7 +104,8 @@ public class GoblinFrontBannerVo implements Serializable {
      */
     @ApiModelProperty(value = "0未删除1已删除")
     private Integer delTag;
-
+    @ApiModelProperty(value = "ticketId")
+    private String ticketId;
     private static final GoblinFrontBannerVo obj = new GoblinFrontBannerVo();
 
     public static GoblinFrontBannerVo getNew() {

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

@@ -115,6 +115,8 @@ public class GoblinGoodsInfoVo implements Serializable, Cloneable {
     private String marketId;
     @ApiModelProperty(position = 61, value = "销量")
     private Integer count;
+    @ApiModelProperty(position = 62, value = "商铺名称")
+    private String storeName;
 
     private static final GoblinGoodsInfoVo obj = new GoblinGoodsInfoVo();
 

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

@@ -25,6 +25,8 @@ public class GoblinShoppingCartVo implements Serializable {
      */
     @ApiModelProperty(value = "官方营销表id")
     private String storeId;
+    @ApiModelProperty(value = "商铺名称")
+    private String storeName;
 
     private static final GoblinShoppingCartVo obj = new GoblinShoppingCartVo();
     public static GoblinShoppingCartVo getNew() {

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

@@ -352,7 +352,36 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
 
     }
     public List<GoblinGoodsInfoVo> searchGoodesName(String name){
-        return null;
+        Pattern pattern = Pattern.compile("^.*"+name+".*$", Pattern.CASE_INSENSITIVE);
+        Query query = new Query();
+        query.addCriteria(Criteria.where("name").regex(pattern));
+        query.with(Sort.by(
+                Sort.Order.desc("count"),
+                Sort.Order.desc("createdAt")
+        ));
+        List<GoblinGoodsInfoVo> list = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
+        ArrayList<GoblinGoodsInfoVo> list1=ObjectUtil.goblinGoodsInfoVoArrayList();
+        //遍历
+        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);
+            }
+        }
+        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);
+            }
+        }
+        return list1;
     }
     public List<GoblinGoodsInfoVo> getStoreGoodes(String storeId,String categoryId,String name){
         //
@@ -773,6 +802,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         }
         //遍历里面信息
         for(GoblinShoppingCartVo goblinShoppingCartVo:goblinShoppingCartVoo.getShopList()){
+            goblinShoppingCartVo.setStoreName(goblinRedisUtils.getStoreInfoVo(goblinShoppingCartVo.getStoreId()).getStoreName());
             for(GoblinShoppingCartVoDetail goblinShoppingCartVoDetail:goblinShoppingCartVo.getSkuList()){
                 //找到对应的  spu  和 sku
                 GoblinGoodsInfoVo goblinGoodsInfoVo=goblinRedisUtils.getGoodsInfoVo(goblinShoppingCartVoDetail.getSpuId());