ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
@@ -120,8 +120,8 @@ @GetMapping(value = "/financial/settlement/downloadSettlement/{uid}") public R<TSettlementConfirm> downloadSettlement(@PathVariable("uid") String uid); @GetMapping(value = "/financial/settlement/settlementTotalR") public R<SettlementTotalVO> settlementTotalR(String time); @GetMapping(value = "/financial/settlement/settlementTotalR/{time}") public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time); /** * 修改充电订单 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -28,6 +28,8 @@ private static final long serialVersionUID = 1L; @ApiModelProperty(value = "累计退款金额 前端忽略") @TableField(exist = false) private BigDecimal refundAmount1; @ApiModelProperty(value = "主键") ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -372,8 +372,6 @@ public R downloadSettlementTotal(@RequestBody ExportUidDto uid,HttpServletResponse response) { SettlementTotalVO data = chargingOrderClient.settlementTotalR(uid.getTime()).getData(); try { response.setCharacterEncoding(Constants.UTF8); response.setContentType("application/vnd.ms-excel"); @@ -392,7 +390,7 @@ WriteSheet writeSheet = EasyExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).build(); excelWriter.fill(new FillWrapper("data1", data.getList1()), fillConfig, writeSheet); // excelWriter.fill(new FillWrapper("data2", data.getList2()), fillConfig, writeSheet); excelWriter.fill(new FillWrapper("data2", data.getList2()), fillConfig, writeSheet); excelWriter.finish(); } catch (Exception e) { return R.fail("excel导出失败！"); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -282,8 +282,8 @@ SettlementTotalVO res = chargingOrderService.settlementTotal(time); return AjaxResult.success(res); } @GetMapping(value = "/settlementTotalR") public R<SettlementTotalVO> settlementTotalR(String time) { @GetMapping(value = "/settlementTotalR/{time}") public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time) { time = time+"-01 00:00:00"; SettlementTotalVO res = chargingOrderService.settlementTotal(time); return R.ok(res);
