Commit 4d659a3e authored by 杨钧's avatar 杨钧

修改逻辑判断错误

parent 1068f8c1
...@@ -13,7 +13,7 @@ public class EarlySettleUpOrderQueryParam { ...@@ -13,7 +13,7 @@ public class EarlySettleUpOrderQueryParam {
private String phoneNo; private String phoneNo;
private Long userId; private Long userId;
private Long loanId; private Long loanId;
private String fundOrderNo; private String fundOrder;
private String channelOrderNo; private String channelOrderNo;
private Long channelId; private Long channelId;
} }
...@@ -316,7 +316,7 @@ public class OrderServiceImpl implements IOrderService { ...@@ -316,7 +316,7 @@ public class OrderServiceImpl implements IOrderService {
} }
private boolean existAtLestOneParam(EarlySettleUpOrderQueryParam orderQuery) { private boolean existAtLestOneParam(EarlySettleUpOrderQueryParam orderQuery) {
return existOrderParam(orderQuery) || existUserParam(orderQuery); return existOrderParam(orderQuery) || existUserParam(orderQuery) || StringUtils.isNotBlank(orderQuery.getFundOrder());
} }
@Override @Override
......
...@@ -365,7 +365,7 @@ public class XyqbServiceImpl implements IXyqbService { ...@@ -365,7 +365,7 @@ public class XyqbServiceImpl implements IXyqbService {
Map<String, Object> queryParam = new HashMap<>(8); Map<String, Object> queryParam = new HashMap<>(8);
if (Objects.isNull(orderQuery.getUserId()) && if (Objects.isNull(orderQuery.getUserId()) &&
Objects.isNull(orderQuery.getLoanId()) && Objects.isNull(orderQuery.getLoanId()) &&
StringUtils.isBlank(orderQuery.getFundOrderNo())) { StringUtils.isBlank(orderQuery.getFundOrder())) {
log.error("{} 请求参数都为空,不允许查询 orderQuery={}", logPre, orderQuery); log.error("{} 请求参数都为空,不允许查询 orderQuery={}", logPre, orderQuery);
return JsonResult.buildErrorStateResult("查询参数都为空,不允许查询", null); return JsonResult.buildErrorStateResult("查询参数都为空,不允许查询", null);
} }
...@@ -378,8 +378,8 @@ public class XyqbServiceImpl implements IXyqbService { ...@@ -378,8 +378,8 @@ public class XyqbServiceImpl implements IXyqbService {
queryParam.put("user_id", String.valueOf(orderQuery.getUserId())); queryParam.put("user_id", String.valueOf(orderQuery.getUserId()));
} }
if(StringUtils.isNotBlank(orderQuery.getFundOrderNo())){ if(StringUtils.isNotBlank(orderQuery.getFundOrder())){
queryParam.put("fund_order_no", orderQuery.getFundOrderNo()); queryParam.put("fund_order_no", orderQuery.getFundOrder());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment