Merge branch 'hjc_admin_galaxy' into dev_pre

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinGagoController.java

@@ -90,6 +90,14 @@ public class GoblinGagoController extends BaseController {
             return AjaxResult.error("该序号已被占用");
         }
         //
+        int count = goblinRedisUtils.decrSkuStock(null,skuId,1);
+        if(count<0){
+            goblinRedisUtils.incrSkuStock(null,skuId,1);
+            goblinRedisUtils.removeNftList(skuId, nftNum + "");
+            return AjaxResult.error("已售罄");
+        }
+
+        //下单
         MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
         params.add("userId", uid);
         params.add("skuId", skuId);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/utils/GoblinRedisUtils.java

@@ -158,7 +158,7 @@ public class GoblinRedisUtils {
     }
 
     //获取 当前xx链上SkuId 发行的数量
-    public int getNftCountBySku(String routerType,String skuId) {
+    public int getNftCountBySku(String routerType, String skuId) {
         String redisKey = GalaxyConstant.REDIS_KEY_GALAXY_PUBLISH_NFT.concat(routerType).concat(":").concat(skuId);
         Object obj = redisDataSourceUtil.getRedisGoblinUtil().get(redisKey);
         if (obj == null) {
@@ -191,10 +191,19 @@ public class GoblinRedisUtils {
         return true;
     }
 
+    //删除 nft序号站位list
+    public boolean removeNftList(String skuId, String num) {
+        String redisKey = GoblinRedisConst.GOBLIN_NUM_LIST.concat(skuId);
+        List<String> voList = getNftList(skuId);
+        voList.remove(skuId);
+        redisDataSourceUtil.getRedisGoblinUtil().set(redisKey, voList);
+        return true;
+    }
+
     public GoblinGoodsSkuInfoVo getGoodsSkuInfoVo(String skuId) {
         String rk = GoblinRedisConst.BASIC_GOODS_SKU.concat(skuId);
         GoblinGoodsSkuInfoVo vo = (GoblinGoodsSkuInfoVo) redisDataSourceUtil.getRedisGoblinUtil().get(rk);
-        if (null == vo ) {
+        if (null == vo) {
             return null;
         }
         return vo;
@@ -205,4 +214,24 @@ public class GoblinRedisUtils {
         String redisKey = GoblinRedisConst.GOBLIN_NUM_DETAILS.concat(num).concat(skuId);
         redisDataSourceUtil.getRedisGoblinUtil().set(redisKey, dto);
     }
+
+    //减少库存
+    public int decrSkuStock(String marketPre, String skuId, Integer stock) {
+        String rk = GoblinRedisConst.REAL_STOCK_SKU;
+        if (marketPre != null && !marketPre.equals("null")) {
+            rk = rk.concat(marketPre + ":");
+        }
+        rk = rk.concat(skuId);
+        return (int) redisDataSourceUtil.getRedisGoblinUtil().decr(rk, stock);
+    }
+
+    //增加库存
+    public int incrSkuStock(String marketPre, String skuId, Integer stock) {
+        String rk = GoblinRedisConst.REAL_STOCK_SKU;
+        if (marketPre != null && !marketPre.equals("null")) {
+            rk = rk.concat(marketPre + ":");
+        }
+        rk = rk.concat(skuId);
+        return (int) redisDataSourceUtil.getRedisGoblinUtil().incr(rk, stock);
+    }
 }