Merge branch 'master-invoice-modular' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -193,7 +193,11 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         if (dto.getType() == OrderTypeEnum.RENT_VEHICLE.getCode()) {
             dto.setRefundStatus(3);
         }
-        dto.setInvoiceStatus(0);
+        if (StringUtils.isBlank(dto.getOrderIds())) {
+            dto.setInvoiceStatus(0);
+        } else {
+            dto.setInvoiceStatus(1);
+        }
         Query query = new Query(dto);
         PageDataVO<OrderPageVO> pages = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
         pages.getData().parallelStream().forEach(data -> {