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,7 @@ public class GoblinFrontBannerVo implements Serializable {
      */
     @ApiModelProperty(value = "0未删除1已删除")
     private Integer delTag;
-    @ApiModelProperty(value = "ticketId")
+    @ApiModelProperty(value = "ticketId，有可能是spuid")
     private String ticketId;
     private static final GoblinFrontBannerVo obj = new GoblinFrontBannerVo();
 

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/spring/RestTemplateConfig.java

@@ -31,9 +31,9 @@ public class RestTemplateConfig {
         PoolingHttpClientConnectionManager poolConnManager =
                 new PoolingHttpClientConnectionManager(20, TimeUnit.SECONDS);
         // 设置最大链接数
-        poolConnManager.setMaxTotal(100000 * getMaxCpuCore());
+        poolConnManager.setMaxTotal(2000 * getMaxCpuCore() + 1000);
         // 单路由的并发数
-        poolConnManager.setDefaultMaxPerRoute(25000 * getMaxCpuCore());
+        poolConnManager.setDefaultMaxPerRoute(1000 * getMaxCpuCore());
 
         HttpClientBuilder httpClientBuilder = HttpClients.custom();
         httpClientBuilder.setConnectionManager(poolConnManager);

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

@@ -176,7 +176,7 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
             if (item.getStockMarketing() > 0) {
                 int restStock = redisUtils.decrSkuStock(null, item.getSkuId(), item.getStockMarketing());
                 if (restStock < 0) {
-                    errorNameList.add(skuVo.getName());
+                    errorNameList.add(skuVo.getName()+"库存不足");
                     redisUtils.incrSkuStock(null, item.getSkuId(), item.getStockMarketing());
                     continue;
                 }
@@ -267,20 +267,27 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
             GoblinGoodsSkuInfoVo skuVo = redisUtils.getGoodsSkuInfoVo(item.getSkuId().concat(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue()).concat(IDGenerator.marketGoodId(params.getSelfMarketId())));
             int changeStock = item.getStockMarketing() - skuVo.getSkuStock();
             //判断库存相关
-            int restStock;
+            int mStock;
+            int sStock;
             if (changeStock > 0) {
-                restStock = redisUtils.incrSkuStock(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue(), skuVo.getSkuId(), changeStock);
-                redisUtils.decrSkuStock(null, item.getSkuId(), changeStock);
+                mStock = redisUtils.incrSkuStock(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue(), skuVo.getSkuId(), changeStock);
+                sStock = redisUtils.decrSkuStock(null, item.getSkuId(), changeStock);
             } else {
-                restStock = redisUtils.decrSkuStock(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue(), skuVo.getSkuId(), -changeStock);
-                redisUtils.incrSkuStock(null, item.getSkuId(), -changeStock);
+                mStock = redisUtils.decrSkuStock(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue(), skuVo.getSkuId(), -changeStock);
+                sStock = redisUtils.incrSkuStock(null, item.getSkuId(), -changeStock);
             }
-            if (restStock < 0) {
-                errorNameList.add(skuVo.getName());
+            if (mStock < 0) {
+                errorNameList.add(skuVo.getName()+"库存不足");
                 redisUtils.incrSkuStock(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue(), skuVo.getSkuId(), -changeStock);
                 redisUtils.decrSkuStock(null, item.getSkuId(), -changeStock);
                 continue;
             }
+            if (sStock < 0) {
+                errorNameList.add(skuVo.getName()+"库存不足");
+                redisUtils.incrSkuStock(null, item.getSkuId(), changeStock);
+                redisUtils.decrSkuStock(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue(), skuVo.getSkuId(), changeStock);
+                continue;
+            }
             skuVo.setPrice(bean.getPriceMarketing());
             skuVo.setPriceMember(bean.getPriceMarketing());
             skuVo.setSkuStock(bean.getStockMarketing());