修改vo 购物车的

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsInfoShopCartVo.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;
+
+@ApiModel(value = "GoblinGoodsInfoShopCartVo", description = "商品购物车spu信息")
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class GoblinGoodsInfoShopCartVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = -4712015317981742851L;
+    @ApiModelProperty(position = 13, value = "商品名称[100]")
+    private String name;
+
+    private static final GoblinGoodsInfoShopCartVo obj = new GoblinGoodsInfoShopCartVo();
+
+    public static GoblinGoodsInfoShopCartVo getNew() {
+        try {
+            return (GoblinGoodsInfoShopCartVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinGoodsInfoShopCartVo();
+        }
+    }
+/*    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/GoblinGoodsSkuShopCartInfoVo.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 = "GoblinGoodsSkuShopCartInfoVo", description = "购物车sku信息")
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class GoblinGoodsSkuShopCartInfoVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = 7139250447538358198L;
+    @ApiModelProperty(position = 24, value = "购买限制[0-全部用户|1-仅会员|2-指定用户]")
+    private String buyFactor;
+    @ApiModelProperty(position = 26, value = "限量[0-无限制|X:限购数量]")
+    private Integer buyLimit;
+    @ApiModelProperty(position = 34, value = "删除标记[0-未删除|1-删除]")
+    private String delFlg;
+    private static final GoblinGoodsSkuShopCartInfoVo obj = new GoblinGoodsSkuShopCartInfoVo();
+    @ApiModelProperty(position = 13, value = "单品的名称[100]")
+    private String name;
+    @ApiModelProperty(position = 21, value = "单品现价[20,2]")
+    private BigDecimal price;
+    @ApiModelProperty(position = 22, value = "单品会员价格[20,2]")
+    private BigDecimal priceMember;
+    @ApiModelProperty(position = 32, value = "单品上架状态[0-待上架|1-下架|2-违规|3-上架]")
+    private String shelvesStatus;
+    @ApiModelProperty(position = 33, value = "自定义展示[0-默认展示|1-隐藏不可购买]")
+    private String skuAppear;
+    @ApiModelProperty(position = 10, value = "商品单品ID")
+    private String skuId;
+    @ApiModelProperty(position = 15, value = "单品默认图片的URL[256]")
+    private String skuPic;
+    @ApiModelProperty(position = 40, value = "单品规格信息")
+    private List<GoblinGoodsSpecDto> skuSpecList;
+    @ApiModelProperty(position = 11, value = "商品ID[64]")
+    private String spuId;
+    @ApiModelProperty(position = 27, value = "商品的店铺ID，如果是平台的则为0")
+    private String storeId;
+    @ApiModelProperty(position = 50, value = "剩余库存")
+    private Integer surplusStock;
+
+    public static GoblinGoodsSkuShopCartInfoVo getNew() {
+        try {
+            return (GoblinGoodsSkuShopCartInfoVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinGoodsSkuShopCartInfoVo();
+        }
+    }
+}

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

@@ -78,10 +78,10 @@ public class GoblinShoppingCartVoDetail implements Serializable {
      * sku
      */
     @ApiModelProperty(value = "sku信息")
-    private  GoblinGoodsSkuInfoVo goblinGoodsSkuInfoVo;
+    private  GoblinGoodsSkuShopCartInfoVo goblinGoodsSkuShopCartInfoVo;
 
     @ApiModelProperty(value = "spu信息")
-    private GoblinGoodsInfoVo goblinGoodsInfoVo;
+    private GoblinGoodsInfoShopCartVo goblinGoodsInfoShopCartVo;
     private static final GoblinShoppingCartVoDetail obj = new GoblinShoppingCartVoDetail();
     public static GoblinShoppingCartVoDetail getNew() {
         try {

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

@@ -1030,9 +1030,19 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
             for(GoblinShoppingCartVoDetail goblinShoppingCartVoDetail:goblinShoppingCartVo.getSkuList()){
                 //找到对应的  spu  和 sku
                 GoblinGoodsInfoVo goblinGoodsInfoVo=goblinRedisUtils.getGoodsInfoVo(goblinShoppingCartVoDetail.getSpuId());
+                if(null==goblinGoodsInfoVo){
+                    goblinGoodsInfoVo=goblinRedisUtils.getGoodsInfoVoByUnShelves(goblinShoppingCartVoDetail.getSpuId());
+                }
                 GoblinGoodsSkuInfoVo goblinGoodsSkuInfoVo=goblinRedisUtils.getGoodsSkuInfoVo(goblinShoppingCartVoDetail.getSkuId());
-                goblinShoppingCartVoDetail.setGoblinGoodsInfoVo(goblinGoodsInfoVo);
-                goblinShoppingCartVoDetail.setGoblinGoodsSkuInfoVo(goblinGoodsSkuInfoVo);
+                if(null==goblinGoodsSkuInfoVo){
+                    goblinGoodsSkuInfoVo=goblinRedisUtils.getGoodsSkuInfoVoByUnShelves(goblinShoppingCartVoDetail.getSkuId());
+                }
+                GoblinGoodsInfoShopCartVo goblinGoodsInfoShopCartVo=GoblinGoodsInfoShopCartVo.getNew();
+                BeanUtils.copyProperties(goblinGoodsInfoVo,goblinGoodsInfoShopCartVo);
+                GoblinGoodsSkuShopCartInfoVo goblinGoodsSkuShopCartInfoVo= GoblinGoodsSkuShopCartInfoVo.getNew();
+                BeanUtils.copyProperties(goblinGoodsSkuInfoVo,goblinGoodsSkuShopCartInfoVo);
+                goblinShoppingCartVoDetail.setGoblinGoodsInfoShopCartVo(goblinGoodsInfoShopCartVo);
+                goblinShoppingCartVoDetail.setGoblinGoodsSkuShopCartInfoVo(goblinGoodsSkuShopCartInfoVo);
             }
         }
         goblinShoppingCartVoo.setShoopingCount(this.getShopCartCount(userId,type));