Skip to content

C
cloud-platform
Commit d5feb89d authored by jiaorz's avatar jiaorz
Browse files
Options

Merge branch 'master-invoice-modular' into dev

parents 5c68b6f4 2244947a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
View file @ d5feb89d
...@@ -193,7 +193,11 @@ public class BaseOrderController extends CommonBaseController implements UserRes ...@@ -193,7 +193,11 @@ public class BaseOrderController extends CommonBaseController implements UserRes
if (dto.getType() == OrderTypeEnum.RENT_VEHICLE.getCode()) { if (dto.getType() == OrderTypeEnum.RENT_VEHICLE.getCode()) {
dto.setRefundStatus(3); dto.setRefundStatus(3);
} }
dto.setInvoiceStatus(0); if (StringUtils.isBlank(dto.getOrderIds())) {
dto.setInvoiceStatus(0);
} else {
dto.setInvoiceStatus(1);
}
Query query = new Query(dto); Query query = new Query(dto);
PageDataVO<OrderPageVO> pages = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper())); PageDataVO<OrderPageVO> pages = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
pages.getData().parallelStream().forEach(data -> { pages.getData().parallelStream().forEach(data -> {
......
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