Merge branch 'pre' into 'master'

Pre

See merge request !243

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

@@ -2129,7 +2129,7 @@ public class GoblinRedisUtils {
         if (
                 info != null
 //                        && LocalDateTime.now().isAfter(info.getSaleStartTime())
-                        && (null == info.getSoldoutStatus() || info.getSoldoutStatus().equals("0"))
+//                        && (null == info.getSoldoutStatus() || info.getSoldoutStatus().equals("0"))
 //                        && (null == info.getHitRatio() || info.getHitRatio().compareTo(BigDecimal.ZERO) > 0)
         ) {// 可以返回库存
             return info.getSkuStock();