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

@@ -19,9 +19,9 @@ import java.util.List;
 @Data
 public class GoblinFrontGoodDetailVo implements Serializable {
     //spu
-    GoblinGoodsInfoVo goblinGoodsInfoVo;
+    GoblinGoodsInfoDetailVo goblinGoodsInfoVo;
     //sku
-    List<GoblinGoodsSkuInfoVo> goblinGoodsSkuInfoVolist;
+    List<GoblinGoodsSkuInfoDetailVo> goblinGoodsSkuInfoVolist;
     @ApiModelProperty(value = "商铺名称")
     String storeName;
 

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsInfoDetailVo.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.math.BigDecimal;
+import java.util.List;
+
+@ApiModel(value = "GoblinGoodsInfoDetailVo", description = "商品SPU详情")
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class GoblinGoodsInfoDetailVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = -4712015317981742851L;
+    @ApiModelProperty(position = 22, value = "规格展现方式[1-常规|2-组合]")
+    private String specMode;
+    @ApiModelProperty(position = 51, value = "规格信息")
+    private List<GoblinGoodsSpecVo> specVoList;
+    @ApiModelProperty(position = 21, value = "商品视频地址")
+    private String video;
+    @ApiModelProperty(position = 40, value = "商品图片列表")
+    private List<String> imageList;
+    @ApiModelProperty(position = 13, value = "商品名称[100]")
+    private String name;
+    @ApiModelProperty(position = 15, value = "销售价-原价[20,2]")
+    private BigDecimal sellPrice;
+    @ApiModelProperty(position = 52, value = "商品标签列表")
+    private List<GoblinGoodsTagVo> tagVoList;
+    @ApiModelProperty(position = 53, value = "商品服务支持列表")
+    private List<GoblinServiceSupportVo> serviceSupportVoList;
+    @ApiModelProperty(position = 54, value = "音乐人、艺术家、IP列表")
+    private List<GoblinGoodsExtagVo> extagVoList;
+    @ApiModelProperty(position = 20, value = "封面图片地址[256]")
+    private String coverPic;
+    @ApiModelProperty(position = 19, value = "商品详情", example = "商品详情...")
+    private String details;
+    @ApiModelProperty(position = 10, value = "店铺ID")
+    private String storeId;
+    @ApiModelProperty(position = 16, value = "价格区间MIN[20,2]")
+    private BigDecimal priceGe;
+    @ApiModelProperty(position = 17, value = "价格区间MAX[20,2]")
+    private BigDecimal priceLe;
+
+    private static final GoblinGoodsInfoDetailVo obj = new GoblinGoodsInfoDetailVo();
+
+    public static GoblinGoodsInfoDetailVo getNew() {
+        try {
+            return (GoblinGoodsInfoDetailVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinGoodsInfoDetailVo();
+        }
+    }
+/*    public int compareTo(GoblinGoodsInfoVo arg0) {
+        return this.getCount().compareTo(arg0.getCount());
+    }*/
+
+}

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+@ApiModel(value = "GoblinGoodsSkuInfoDetailVo", description = "商品SKU信息，详情")
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class GoblinGoodsSkuInfoDetailVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = 7139250447538358198L;
+
+    @ApiModelProperty(position = 24, value = "购买限制[0-全部用户|1-仅会员|2-指定用户]")
+    private String buyFactor;
+    @ApiModelProperty(position = 40, value = "单品规格信息")
+    private List<GoblinGoodsSpecDto> skuSpecList;
+    @ApiModelProperty(position = 22, value = "单品会员价格[20,2]")
+    private BigDecimal priceMember;
+    @ApiModelProperty(position = 10, value = "商品单品ID")
+    private String skuId;
+    @ApiModelProperty(position = 15, value = "单品默认图片的URL[256]")
+    private String skuPic;
+    @ApiModelProperty(position = 21, value = "单品现价[20,2]")
+    private BigDecimal price;
+    @ApiModelProperty(position = 33, value = "自定义展示[0-默认展示|1-隐藏不可购买]")
+    private String skuAppear;
+
+    private static final GoblinGoodsSkuInfoDetailVo obj = new GoblinGoodsSkuInfoDetailVo();
+
+    public static GoblinGoodsSkuInfoDetailVo getNew() {
+        try {
+            return (GoblinGoodsSkuInfoDetailVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinGoodsSkuInfoDetailVo();
+        }
+    }
+}

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

@@ -263,14 +263,18 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
     public  GoblinFrontGoodDetailVo getGoodsDetail(String spuId){
         GoblinFrontGoodDetailVo goblinFrontGoodDetailVo=GoblinFrontGoodDetailVo.getNew();
         GoblinGoodsInfoVo goblinGoodsInfoVo=goblinRedisUtils.getGoodsInfoVo(spuId);
-        goblinFrontGoodDetailVo.setGoblinGoodsInfoVo(goblinGoodsInfoVo);
+        GoblinGoodsInfoDetailVo goblinGoodsInfoDetailVo=GoblinGoodsInfoDetailVo.getNew();
+        BeanUtils.copyProperties(goblinGoodsInfoVo,goblinGoodsInfoDetailVo);
+        goblinFrontGoodDetailVo.setGoblinGoodsInfoVo(goblinGoodsInfoDetailVo);
         //skuIdList
         if(null!=goblinGoodsInfoVo){
             List<String> skuIdList=goblinGoodsInfoVo.getSkuIdList();
-            ArrayList<GoblinGoodsSkuInfoVo> list=ObjectUtil.getGoblinGoodsSkuInfoVoArrayList();
+            ArrayList<GoblinGoodsSkuInfoDetailVo> list=ObjectUtil.goblinGoodsSkuInfoDetailVos();
             for(String sku:skuIdList){
                 GoblinGoodsSkuInfoVo goblinGoodsSkuInfoVo=goblinRedisUtils.getGoodsSkuInfoVo(sku);
-                list.add(goblinGoodsSkuInfoVo);
+                GoblinGoodsSkuInfoDetailVo goblinGoodsSkuInfoDetailVo=GoblinGoodsSkuInfoDetailVo.getNew();
+                BeanUtils.copyProperties(goblinGoodsSkuInfoVo,goblinGoodsSkuInfoDetailVo);
+                list.add(goblinGoodsSkuInfoDetailVo);
             }
             //goblinGoodsInfoVo
             GoblinStoreInfoVo goblinStoreInfoVo=this.getStore(goblinGoodsInfoVo.getStoreId());
@@ -397,7 +401,11 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
     public List<GoblinGoodsInfoVo> searchGoodesName(String name){
         Pattern pattern = Pattern.compile("^.*"+name+".*$", Pattern.CASE_INSENSITIVE);
         Query query = new Query();
-        query.addCriteria(Criteria.where("name").regex(pattern).and("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3"));
+        query.addCriteria(new Criteria().orOperator(
+                Criteria.where("name").regex(pattern).and("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3"),
+                Criteria.where("storeName").regex(pattern).and("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3")
+        ));
+       // query.addCriteria(Criteria.where("name").regex(pattern).and("spuAppear").is("0").and("delFlg").is("0").and("shelvesStatus").is("3"));
         query.with(Sort.by(
                 Sort.Order.desc("count"),
                 Sort.Order.desc("createdAt")

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

@@ -15,7 +15,6 @@ import com.mongodb.client.model.WriteModel;
 import org.bson.Document;
 
 import java.util.ArrayList;
-import java.util.List;
 
 public class ObjectUtil {
     private static final PagedResult<GoblinStoreMgtGoodsListVo> goblinStoreMgtGoodsVoPagedResult = new PagedResult<>();
@@ -60,6 +59,7 @@ public class ObjectUtil {
     private static final ArrayList<GoblinBackOrderSkuVo> goblinBackOrderSkuVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinBackOrderVo> goblinBackOrderVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinFrontNavigationVo> goblinFrontNavigationVoArrayList = new ArrayList<>();
+    private static final ArrayList<GoblinGoodsSkuInfoDetailVo> goblinGoodsSkuInfoDetailVos = new ArrayList<>();
     private static final BasicDBObject basicDBObject = new BasicDBObject();
     private static final ArrayList<WriteModel<Document>> writeModelDocumentArrayList = new ArrayList<>();
 
@@ -71,6 +71,9 @@ public class ObjectUtil {
         return goblinStoreNoticeVoPagedResult.clone();
     }
 
+    public static ArrayList<GoblinGoodsSkuInfoDetailVo> goblinGoodsSkuInfoDetailVos() {
+        return (ArrayList<GoblinGoodsSkuInfoDetailVo>) goblinGoodsSkuInfoDetailVos.clone();
+    }
     public static ArrayList<GoblinBackOrderVo> goblinBackOrderVoArrayList() {
         return (ArrayList<GoblinBackOrderVo>) goblinBackOrderVoArrayList.clone();
     }