修改限购。

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

@@ -32,8 +32,11 @@ public class GoblinGoodsSkuInfoDetailVo implements Serializable, Cloneable {
     private String skuAppear;
     @ApiModelProperty(position = 11, value = "商品ID[64]")
     private String spuId;
-    @ApiModelProperty(position = 12, value = "库存是否告警，true 告警，false没有告警")
+    @ApiModelProperty(position = 12, value = "true 没有库存了， false 有库存")
     private boolean stockLess;
+    @ApiModelProperty(position = 13, value = "可以购买数量")
+    private int canBuy;
+
     @ApiModelProperty(position = 26, value = "限量[0-无限制|X:限购数量]")
     private Integer buyLimit;
 

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

@@ -17,6 +17,7 @@ import com.liquidnet.service.goblin.util.ObjectUtil;
 import com.liquidnet.service.goblin.util.QueueUtils;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -279,6 +280,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
      * 获得商品详情
      */
     public  GoblinFrontGoodDetailVo getGoodsDetail(String spuId){
+        Integer buyCount=0;
         GoblinFrontGoodDetailVo goblinFrontGoodDetailVo=GoblinFrontGoodDetailVo.getNew();
         GoblinGoodsInfoVo goblinGoodsInfoVo=goblinRedisUtils.getGoodsInfoVo(spuId);
         GoblinGoodsInfoDetailVo goblinGoodsInfoDetailVo=GoblinGoodsInfoDetailVo.getNew();
@@ -286,17 +288,27 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         goblinFrontGoodDetailVo.setGoblinGoodsInfoVo(goblinGoodsInfoDetailVo);
         //skuIdList
         if(null!=goblinGoodsInfoVo){
-           int limit= getStockCount(goblinGoodsInfoVo.getStoreId());
+          // int limit= getStockCount(goblinGoodsInfoVo.getStoreId());
             List<String> skuIdList=goblinGoodsInfoVo.getSkuIdList();
             ArrayList<GoblinGoodsSkuInfoDetailVo> list=ObjectUtil.goblinGoodsSkuInfoDetailVos();
             for(String sku:skuIdList){
+                String userId=CurrentUtil.getCurrentUid();
+                if(StringUtils.isNotBlank(userId)){
+                    buyCount=goblinRedisUtils.getSkuCountByUid(userId, sku);
+                }
                 GoblinGoodsSkuInfoVo goblinGoodsSkuInfoVo=goblinRedisUtils.getGoodsSkuInfoVo(sku);
                 if(null!=goblinGoodsSkuInfoVo){
                     //获取 sku 库存数量
                     int stock=goblinRedisUtils.getSkuStock(null,goblinGoodsSkuInfoVo.getSkuId());
                     GoblinGoodsSkuInfoDetailVo goblinGoodsSkuInfoDetailVo=GoblinGoodsSkuInfoDetailVo.getNew();
                     BeanUtils.copyProperties(goblinGoodsSkuInfoVo,goblinGoodsSkuInfoDetailVo);
-                    if(limit>=stock){
+                    if(null!=goblinGoodsSkuInfoDetailVo.getBuyLimit()){
+                        if(null==buyCount){
+                            buyCount=0;
+                        }
+                        goblinGoodsSkuInfoDetailVo.setCanBuy(goblinGoodsSkuInfoDetailVo.getBuyLimit()-buyCount);
+                    }
+                    if(stock<=0){
                         goblinGoodsSkuInfoDetailVo.setStockLess(true);
                     }else{
                         goblinGoodsSkuInfoDetailVo.setStockLess(false);