Merge remote-tracking branch 'origin/dev' into dev

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

@@ -384,7 +384,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
         if(flag != null && flag == true) {
             return baseOrderBiz.orderDetail(orderNo, userDTO);
         } else {
-            return baseOrderBiz.getOrderDetail(orderNo, userDTO);
+            return baseOrderBiz.orderDetail(orderNo, userDTO);
         }
     }
 

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

@@ -173,12 +173,32 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         PageDataVO<OrderPageVO> pages = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
         pages.getData().parallelStream().forEach(data -> {
             data.setQrcodeStr(qrcodePrefix);
+//            data.setOrderRealAmount(data.getRealAmount().subtract(orderAccountBiz.getAllOrderCost(data.getId())));
+//        	log.info("订单实际支付金额，扣除押金违章之后: {}", data.getOrderRealAmount());
+        });
+        return new ObjectRestResponse<>().data(pages);
+    }
+
+    @RequestMapping(value = "/getInvoiceOrderList", method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "发票订单列表")
+    @IgnoreClientToken
+    public ObjectRestResponse<PageDataVO<OrderPageVO>> getInvoiceOrderList(QueryOrderDTO dto) {
+        //查询列表数据
+        if (StringUtils.isBlank(BaseContextHandler.getUserID())) {
+            throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
+        }
+        //dto.setCrtUser(Integer.valueOf(BaseContextHandler.getUserID()));
+        dto.setUserId(Integer.valueOf(BaseContextHandler.getUserID()));
+        Query query = new Query(dto);
+        PageDataVO<OrderPageVO> pages = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
+        pages.getData().parallelStream().forEach(data -> {
+            data.setQrcodeStr(qrcodePrefix);
             data.setOrderRealAmount(data.getRealAmount().subtract(orderAccountBiz.getAllOrderCost(data.getId())));
             log.info("订单实际支付金额，扣除押金违章之后: {}", data.getOrderRealAmount());
         });
         return new ObjectRestResponse<>().data(pages);
     }
-
     @ApiOperation("查询个数")
     @RequestMapping(value = "/count",method = RequestMethod.GET)
     @ResponseBody