@@ -69,7 +69,7 @@ public class ApiAspect {
}
String token = CommonUtils.getToken(request);
-// log.info("用户token:{} 访问 {}", token, request.getRequestURI());
+ log.info("用户token:{} 访问 {}", token, request.getRequestURI());
String jwtUserId = CommonUtils.getUserId(request);
if (StringUtils.isNotBlank(jwtUserId) && StringUtils.isNotBlank(token) && token.equals(jwtUserId)) {
throw new RemoteServiceException(ResponseHelper.ResponseCode_TOKEN_ID_ERROR, "请求不合法, token");
@@ -116,6 +116,9 @@ public class OrderBaseLogic {
List<String> orderBaseIds = pgOrderWorkerEs.stream().map(PgOrderWorkerEs::getOrderBaseId).collect(Collectors.toList());
+ if (CollectionUtil.isEmpty(orderBaseIds))
+ return new CountOrderStatusBean();
+
BoolQueryBuilder boolQueryOrder = QueryBuilders.boolQuery()
.mustNot(QueryBuilders.termsQuery("order_status", "YQX","FWQX","FL","FWZT","YCGB"))
;