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

@@ -42,9 +42,16 @@ public class GoblinGoodsSkuShopCartInfoVo implements Serializable, Cloneable {
     private String spuId;
     @ApiModelProperty(position = 27, value = "商品的店铺ID，如果是平台的则为0")
     private String storeId;
-    @ApiModelProperty(position = 50, value = "剩余库存")
-    private Integer surplusStock;
 
+    @ApiModelProperty(position = 12, value = "true 没有库存了， false 有库存")
+    private boolean stockLess;
+    @ApiModelProperty(position = 13, value = "可以购买数量")
+    private int canBuy;
+
+
+    /* @ApiModelProperty(position = 50, value = "剩余库存")
+    private Integer surplusStock;
+*/
     public static GoblinGoodsSkuShopCartInfoVo getNew() {
         try {
             return (GoblinGoodsSkuShopCartInfoVo) obj.clone();

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

@@ -1081,6 +1081,52 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
 */
     return true;
     }
+    //获得spu
+    public GoblinGoodsInfoVo getGoodsInfoVo(GoblinShoppingCartVoDetail goblinShoppingCartVoDetail){
+        GoblinGoodsInfoVo goblinGoodsInfoVo=goblinRedisUtils.getGoodsInfoVo(goblinShoppingCartVoDetail.getSpuId());
+        if(null==goblinGoodsInfoVo){
+            goblinGoodsInfoVo=goblinRedisUtils.getGoodsInfoVoByUnShelves(goblinShoppingCartVoDetail.getSpuId());
+        }
+        return goblinGoodsInfoVo;
+    }
+    //获得sku
+    public GoblinGoodsSkuInfoVo getGoblinGoodsSkuInfoVo(GoblinShoppingCartVoDetail goblinShoppingCartVoDetail){
+        GoblinGoodsSkuInfoVo goblinGoodsSkuInfoVo=goblinRedisUtils.getGoodsSkuInfoVo(goblinShoppingCartVoDetail.getSkuId());
+        if(null==goblinGoodsSkuInfoVo){
+            goblinGoodsSkuInfoVo=goblinRedisUtils.getGoodsSkuInfoVoByUnShelves(goblinShoppingCartVoDetail.getSkuId());
+        }
+        return goblinGoodsSkuInfoVo;
+    }
+    //copy spu
+    public GoblinGoodsInfoShopCartVo copySpuVo(GoblinGoodsInfoVo goblinGoodsInfoVo){
+        GoblinGoodsInfoShopCartVo goblinGoodsInfoShopCartVo=GoblinGoodsInfoShopCartVo.getNew();
+        if(null!=goblinGoodsInfoVo){
+            BeanUtils.copyProperties(goblinGoodsInfoVo,goblinGoodsInfoShopCartVo);
+        }
+        return goblinGoodsInfoShopCartVo;
+    }
+    //copy sku
+    public GoblinGoodsSkuShopCartInfoVo copySkuVo(GoblinGoodsSkuInfoVo goblinGoodsSkuInfoVo,String userId){
+        GoblinGoodsSkuShopCartInfoVo goblinGoodsSkuShopCartInfoVo= GoblinGoodsSkuShopCartInfoVo.getNew();
+        if(null!=goblinGoodsSkuInfoVo){
+            BeanUtils.copyProperties(goblinGoodsSkuInfoVo,goblinGoodsSkuShopCartInfoVo);
+            //查看是否有库存
+            int stock=goblinRedisUtils.getSkuStock(null,goblinGoodsSkuInfoVo.getSkuId());
+            if(stock<=0){
+                goblinGoodsSkuShopCartInfoVo.setStockLess(true);
+            }else {goblinGoodsSkuShopCartInfoVo.setStockLess(false);}
+            //查看已经购买数量
+            Integer buyCount=goblinRedisUtils.getSkuCountByUid(userId, goblinGoodsSkuShopCartInfoVo.getSkuId());
+            //查看限购数量
+            if(null==buyCount){buyCount=0;}
+            if(null!=goblinGoodsSkuShopCartInfoVo.getBuyLimit()){
+                goblinGoodsSkuShopCartInfoVo.setCanBuy(goblinGoodsSkuShopCartInfoVo.getBuyLimit()-buyCount);
+            }else{
+                goblinGoodsSkuShopCartInfoVo.setCanBuy(-9999);
+            }
+        }
+        return goblinGoodsSkuShopCartInfoVo;
+    }
     /**
      * @author zhangfuxin
      * @Description: 获得购物车列表
@@ -1098,23 +1144,14 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                 goblinShoppingCartVo.setStoreName(goblinRedisUtils.getStoreInfoVo(goblinShoppingCartVo.getStoreId()).getStoreName());
             }
             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());
-                if(null==goblinGoodsSkuInfoVo){
-                    goblinGoodsSkuInfoVo=goblinRedisUtils.getGoodsSkuInfoVoByUnShelves(goblinShoppingCartVoDetail.getSkuId());
-                }
-                GoblinGoodsInfoShopCartVo goblinGoodsInfoShopCartVo=GoblinGoodsInfoShopCartVo.getNew();
-                if(null!=goblinGoodsInfoVo){
-                    BeanUtils.copyProperties(goblinGoodsInfoVo,goblinGoodsInfoShopCartVo);
-                }
-                GoblinGoodsSkuShopCartInfoVo goblinGoodsSkuShopCartInfoVo= GoblinGoodsSkuShopCartInfoVo.getNew();
-                if(null!=goblinGoodsInfoVo){
-                    BeanUtils.copyProperties(goblinGoodsSkuInfoVo,goblinGoodsSkuShopCartInfoVo);
-                }
+                //找到对应的  spu
+                GoblinGoodsInfoVo goblinGoodsInfoVo=getGoodsInfoVo(goblinShoppingCartVoDetail);
+                // 找到对应 sku
+                GoblinGoodsSkuInfoVo goblinGoodsSkuInfoVo=getGoblinGoodsSkuInfoVo(goblinShoppingCartVoDetail);
+                //spu copy
+                GoblinGoodsInfoShopCartVo goblinGoodsInfoShopCartVo=copySpuVo(goblinGoodsInfoVo);
+                //sku copy
+                GoblinGoodsSkuShopCartInfoVo goblinGoodsSkuShopCartInfoVo= copySkuVo(goblinGoodsSkuInfoVo,userId);
                 goblinShoppingCartVoDetail.setGoblinGoodsInfoVo(goblinGoodsInfoShopCartVo);
                 goblinShoppingCartVoDetail.setGoblinGoodsSkuInfoVo(goblinGoodsSkuShopCartInfoVo);
             }