Commit d313c0ff by 陈斌

Merge remote-tracking branch 'remotes/origin/feature/20210915_订单发票_chenbin' into qa

parents 30f76434 34f9639b
...@@ -50,7 +50,7 @@ public class OrderInvoiceAdapter { ...@@ -50,7 +50,7 @@ public class OrderInvoiceAdapter {
return ResponseUtil.error(ResponseResult.ORDER_INVOINVE_LIMIT_30); return ResponseUtil.error(ResponseResult.ORDER_INVOINVE_LIMIT_30);
} }
// 【3】 过滤订单状态&&实付金额是否符合开票原则 // 【3】 过滤订单状态&&实付金额是否符合开票原则
List<OrderBeanV1> orderBeanV1List = orders.stream().filter(x -> canOpenOrderInvoiceStatus.contains(x.getStatusV2())) List<OrderBeanV1> orderBeanV1List = orders.stream().filter(x -> canOpenOrderInvoiceStatus.contains(x.getStatus()))
.filter(x -> x.getActualPayAmount() != null).collect(Collectors.toList()); .filter(x -> x.getActualPayAmount() != null).collect(Collectors.toList());
if(CollectionUtils.isEmpty(orderBeanV1List)){ if(CollectionUtils.isEmpty(orderBeanV1List)){
return ResponseUtil.error(ResponseResult.ORDER_INVOICE_OPEN_ERR); return ResponseUtil.error(ResponseResult.ORDER_INVOICE_OPEN_ERR);
......
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