Merge remote-tracking branch 'origin/hjc_goblin_list_unbox' into hjc_goblin_list_unbox

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-common/src/main/java/com/liquidnet/service/galaxy/router/zxin/biz/ZxinUserCommonBiz.java

@@ -262,7 +262,7 @@ public class ZxinUserCommonBiz {
         }
 
         long endTime = System.currentTimeMillis();
-        log.error("开通数字账户userRegister总耗时:{} ",endTime-startTime);
+        log.info("开通数字账户userRegister总耗时:{} ",endTime-startTime);
 
         if(StringUtil.isNotEmpty(sysFailDesc)){
             return ResponseDto.failure(sysFailDesc);
@@ -356,7 +356,7 @@ public class ZxinUserCommonBiz {
                     ,reqDto.getUserName().concat(",").concat(reqDto.getMobile()),openAccFailKeyExpireTime);
         }
         long endTime = System.currentTimeMillis();
-        log.error("同步数字账户syncOpenAccount总耗时:{} ",endTime-startTime);
+        log.info("同步数字账户syncOpenAccount总耗时:{} ",endTime-startTime);
         return isOpenAccount;
     }
 

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

@@ -96,11 +96,11 @@ public class GoblinNftBoxUtils {
                 continue;
             }
 
-            BigDecimal bigDecimal = BigDecimal.valueOf(exStock).multiply((new BigDecimal(hitRatio.toString()).divide(hitRatioCount, 2, BigDecimal.ROUND_HALF_UP)));
+            BigDecimal bigDecimal = BigDecimal.valueOf(exStock).multiply((new BigDecimal(hitRatio.toString()).divide(hitRatioCount, 5, BigDecimal.ROUND_HALF_UP)));
             bigDecimalHashMap.put(key, bigDecimal);
 
             // 要减去的库存
-            int subStock = BigDecimal.valueOf(exStock).multiply((new BigDecimal(hitRatio.toString()).divide(hitRatioCount, 2, BigDecimal.ROUND_HALF_UP))).setScale(0, BigDecimal.ROUND_UP).intValue();
+            int subStock = BigDecimal.valueOf(exStock).multiply((new BigDecimal(hitRatio.toString()).divide(hitRatioCount, 5, BigDecimal.ROUND_HALF_UP))).setScale(0, BigDecimal.ROUND_UP).intValue();
 
             if (subStock > Integer.valueOf(stock.toString())) {
                 subNumber += Integer.valueOf(stock.toString());

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

@@ -2129,7 +2129,8 @@ public class GoblinRedisUtils {
                 info != null
                         && (null == info.getSoldoutStatus() || info.getSoldoutStatus().equals("0"))
                         && (null == info.getHitRatio() || info.getHitRatio().compareTo(BigDecimal.ZERO) > 0)
-                        && (null == info.getSkuCanbuy() || info.getSkuCanbuy().equals("1"))
+                        && (null == info.getSkuCanbuy() || info.getSkuCanbuy().equals("1")
+                        && (null == info.getShelvesStatus() || info.getShelvesStatus().equals("3")))
         ) {// 可以返回库存
             return getSkuStock(null, info.getSkuId());
         } else {// 不计入库存