From 484e80782fec58e8a077d63e622302c41e77d1d9 Mon Sep 17 00:00:00 2001 From: zhibing.pu <393733352@qq.com> Date: 星期二, 10 九月 2024 11:16:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 81 ++++ ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java | 2 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java | 2 ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/PaymentOrder.java | 2 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 4 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderMapVO.java | 19 + ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java | 11 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java | 39 + ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java | 7 ruoyi-service/ruoyi-chargingPile/src/main/resources/template/账户结算账单.xlsx | 0 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java | 64 +++ ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderPowerMapVO.java | 16 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java | 5 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserMapVO.java | 26 + ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 41 + ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountListVO.java | 6 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java | 39 ++ ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/VipFallbackFactory.java | 6 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 343 ++++++++++++++++++ ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java | 6 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/export/TParkingRecordExport.java | 41 ++ ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 274 ++++++++++---- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillListVO.java | 1 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserEvaluateVO.java | 18 + 24 files changed, 942 insertions(+), 111 deletions(-) diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java index 35c5873..61b14b5 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java @@ -3,9 +3,11 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.dto.ExchangeDto; import com.ruoyi.order.api.feignClient.OrderClient; +import com.ruoyi.order.api.model.ChargingListQuery; import com.ruoyi.order.api.model.TShoppingOrder; import com.ruoyi.order.api.model.TVipOrder; import com.ruoyi.order.api.query.TActivityStatisticsQuery; +import com.ruoyi.order.api.vo.AccountListVO; import com.ruoyi.order.api.vo.TActivityVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -73,6 +75,11 @@ return R.fail("查询活动费用统计失败:" + cause.getMessage()); } + @Override + public R<AccountListVO> accountBillList(ChargingListQuery dto) { + return R.fail("账户结算账单导出失败:" + cause.getMessage()); + } + }; } diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java index c0f9cd8..c49e25f 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java @@ -4,10 +4,13 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.dto.ExchangeDto; import com.ruoyi.order.api.factory.OrderFallbackFactory; +import com.ruoyi.order.api.model.ChargingListQuery; import com.ruoyi.order.api.model.TShoppingOrder; import com.ruoyi.order.api.model.TVipOrder; import com.ruoyi.order.api.query.TActivityStatisticsQuery; +import com.ruoyi.order.api.vo.AccountListVO; import com.ruoyi.order.api.vo.TActivityVO; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -50,5 +53,8 @@ */ @PostMapping(value = "/t-exchange-order/activityStatistics") public R<TActivityVO> activityStatistics(@RequestBody TActivityStatisticsQuery dto); + @PostMapping(value = "/chargingBill/accountBillList") + @ApiOperation(value = "列表查询", tags = {"管理后台-账户结算账单"}) + R<AccountListVO> accountBillList(@RequestBody ChargingListQuery dto); } diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountListVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountListVO.java index c6d4056..f2ea33c 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountListVO.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountListVO.java @@ -14,15 +14,17 @@ @ApiModel(value = "ChargingBillListVO对象",description = "充电算帐单列表VO") public class AccountListVO{ @ApiModelProperty(value = "账单数量") - private String billCount; + private Integer billCount; @ApiModelProperty(value = "总入账金额") private BigDecimal totalAmount; @ApiModelProperty(value = "总支付结算金额") private BigDecimal paymentAmount; @ApiModelProperty(value = "总退款结算金额") - private BigDecimal orderAmount; + private BigDecimal refundAmount; @ApiModelProperty(value = "平台手续费") private BigDecimal commissionAmount; + @ApiModelProperty(value = "分佣") + private BigDecimal sharingAmount; @ApiModelProperty(value = "列表数据") private PageInfo<ChargingBillListVO> list; diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillListVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillListVO.java index 9576bec..78139c6 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillListVO.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillListVO.java @@ -34,7 +34,6 @@ private BigDecimal serviceCharge; @ApiModelProperty(value = "平台手续费") private BigDecimal commissionAmount; - @ApiModelProperty(value = "充电电流 度") private BigDecimal chargingCapacity; } diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java index 9ea35ee..2000729 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java @@ -18,6 +18,8 @@ private BigDecimal paymentAmount; @ApiModelProperty(value = "订单总金额") private BigDecimal orderAmount; + @ApiModelProperty(value = "总退款金额") + private BigDecimal refundAmount; @ApiModelProperty(value = "累计电费") private BigDecimal electrovalence; @ApiModelProperty(value = "累计服务费") diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderMapVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderMapVO.java new file mode 100644 index 0000000..b2d3618 --- /dev/null +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderMapVO.java @@ -0,0 +1,19 @@ +package com.ruoyi.order.api.vo; + +import com.ruoyi.common.core.web.page.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + +@Data +public class TCharingOrderMapVO { + @ApiModelProperty("上分饼图") + private List<Map<String,Object>> maps; + @ApiModelProperty("下方折线图") + private List<Map<String,Object>> maps1; +} diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderPowerMapVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderPowerMapVO.java new file mode 100644 index 0000000..e1d2297 --- /dev/null +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderPowerMapVO.java @@ -0,0 +1,16 @@ +package com.ruoyi.order.api.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + +@Data +public class TCharingOrderPowerMapVO { + @ApiModelProperty("上分折线图") + List<Map<String,Object>> maps; + @ApiModelProperty("下方饼图") + private Map<String,Object> maps1; +} diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserEvaluateVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserEvaluateVO.java new file mode 100644 index 0000000..9086c3c --- /dev/null +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserEvaluateVO.java @@ -0,0 +1,18 @@ +package com.ruoyi.order.api.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +@Data +public class TCharingUserEvaluateVO { + @ApiModelProperty("评价分") + Long aver; + @ApiModelProperty("各个评分数量") + List<Map<String,Object>> evaluate; + @ApiModelProperty("差评数量") + Long blackCount; + +} diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserMapVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserMapVO.java new file mode 100644 index 0000000..e8859d1 --- /dev/null +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingUserMapVO.java @@ -0,0 +1,26 @@ +package com.ruoyi.order.api.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.naming.ldap.PagedResultsControl; +import java.util.List; +import java.util.Map; + +@Data +public class TCharingUserMapVO { + @ApiModelProperty("上分折线图") + private List<Map<String,Object>> map; + @ApiModelProperty("用户标签") + private List<Map<String,Object>> userMaps; + @ApiModelProperty("单位消费") + private List<Map<String, Object>> untiMap; + @ApiModelProperty("会员标签") + private List<Map<String,Object>> vipMaps; + @ApiModelProperty("车辆用途") + private List<Map<String, Object>> carMap; + @ApiModelProperty("车辆品牌") + private List<Map<String, Object>> carBrandMap; + @ApiModelProperty("本地车数量") + private Map<String,Object> localCarMap; +} diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/VipFallbackFactory.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/VipFallbackFactory.java index 8a3cf05..275a7ff 100644 --- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/VipFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/VipFallbackFactory.java @@ -1,5 +1,6 @@ package com.ruoyi.other.api.factory; +import com.ruoyi.account.api.dto.GiveVipDto; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.other.api.domain.TVip; @@ -35,6 +36,11 @@ } @Override + public R giveVip(GiveVipDto giveVipDto) { + return R.fail("赠送会员:" + throwable.getMessage()); + } + + @Override public R<TVip> getInfo1(Integer id) { return R.fail("根据会员id 获取会员信息:" + throwable.getMessage()); } diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java index 7d33fd2..e958ad7 100644 --- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java +++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java @@ -1,5 +1,6 @@ package com.ruoyi.other.api.feignClient; +import com.ruoyi.account.api.dto.GiveVipDto; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.domain.AjaxResult; @@ -8,6 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; /** @@ -37,5 +39,6 @@ @PostMapping(value = "/vip/getInfo") R<TVip> getInfo(@RequestParam("id") Integer id); - + @PostMapping(value = "/t-app-user/user/give/vip") + R giveVip(@RequestBody GiveVipDto giveVipDto); } diff --git a/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/PaymentOrder.java b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/PaymentOrder.java index b9c18a9..8e634b3 100644 --- a/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/PaymentOrder.java +++ b/ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/PaymentOrder.java @@ -29,5 +29,5 @@ /** * 回调地址 */ - private String notifyUrl ="/"; + private String notifyUrl ="http://192.168.110.80:9000/payment/wx/pay/notify"; } diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java index c1e071b..98956eb 100644 --- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java +++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java @@ -7,8 +7,10 @@ import com.ruoyi.chargingPile.api.model.Site; import com.ruoyi.common.core.utils.WebUtils; import com.ruoyi.common.core.web.page.PageInfo; +import com.ruoyi.order.api.feignClient.OrderClient; import com.ruoyi.order.api.model.TChargingOrder; import com.ruoyi.order.api.model.TSettlementConfirm; +import com.ruoyi.order.api.vo.AccountListVO; import com.ruoyi.order.api.vo.ChargingBillListVO; @@ -80,6 +82,8 @@ private final RedisService redisService; @Resource private ChargingOrderClient chargingOrderClient; + @Resource + private OrderClient orderClient; @Resource private SiteClient siteClient; @@ -282,13 +286,44 @@ } return R.ok(); } + @ApiOperation(value = "下载", tags = {"管理后台-账户结算账单"}) + @PutMapping("/downloadAccount") + public R downloadAccount(@RequestBody ChargingListQuery dto,HttpServletResponse response) + { + AccountListVO data = orderClient.accountBillList(dto).getData(); + try { + response.setCharacterEncoding(Constants.UTF8); + response.setContentType("application/vnd.ms-excel"); + response.setHeader("Access-Control-Expose-Headers", "Content-disposition"); + response.setHeader("Content-Disposition", "attachment;filename=" + + URLEncoder.encode("账户结算账单", CharEncoding.UTF_8) + ".xlsx"); + } catch (UnsupportedEncodingException e) { + return R.fail("excel导出失败!"); + } + try { + // excel模板封装 + ExcelWriterBuilder excelWriterBuilder = EasyExcelFactory.write(response.getOutputStream()); + InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream("template/" +"账户结算账单" + ".xlsx"); + // 自动释放资源 + try (ExcelWriter excelWriter = excelWriterBuilder.withTemplate(stream).build()) { + WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).build(); + excelWriter.fill(new FillWrapper("data1", data.getList().getRecords()), fillConfig, writeSheet); + excelWriter.finish(); + } catch (Exception e) { + return R.fail("excel导出失败!"); + } + } catch (IOException e) { + return R.fail("excel导出失败!"); + } + return R.ok(); + } + @ApiOperation(value = "导出", tags = {"管理后台-结算汇总表"}) @GetMapping("/downloadSettlementTotal") public R downloadSettlementTotal(String time,HttpServletResponse response) { SettlementTotalVO data = chargingOrderClient.settlementTotalR(time).getData(); - - try { response.setCharacterEncoding(Constants.UTF8); response.setContentType("application/vnd.ms-excel"); diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java index 9718c4c..fec52ef 100644 --- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java +++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java @@ -1,6 +1,8 @@ package com.ruoyi.chargingPile.controller; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.chargingPile.api.model.TParkingLot; @@ -10,15 +12,30 @@ import com.ruoyi.chargingPile.api.vo.TParkingRecordPageInfoVO; import com.ruoyi.chargingPile.api.vo.TParkingRecordVO; import com.ruoyi.chargingPile.dto.ParkingRecordPageQuery; +import com.ruoyi.chargingPile.export.TParkingRecordExport; import com.ruoyi.chargingPile.service.TParkingLotService; import com.ruoyi.chargingPile.service.TParkingRecordService; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.common.core.utils.WebUtils; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.PageInfo; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.order.api.query.TOrderInvoiceQuery; +import com.ruoyi.order.api.vo.TOrderInvoiceVO; import io.swagger.annotations.ApiOperation; +import org.apache.poi.ss.usermodel.Workbook; +import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.List; /** * <p> @@ -58,13 +75,54 @@ public R<TParkingRecordPageInfoVO> pageList(@RequestBody ParkingRecordQuery query) { return R.ok(parkingRecordService.pageList(query)); } - + @ApiOperation(tags = {"后台-订单管理-停车记录"},value = "导出") + @PutMapping("/export") + public void export(@RequestBody ParkingRecordQuery query) + { + List<TParkingRecordVO> records = parkingRecordService.pageList(query).getParkingRecordVOS().getRecords(); + List<TParkingRecordExport> orderInvoiceExports = new ArrayList<>(); + for (TParkingRecordVO orderInvoiceVO : records) { + TParkingRecordExport orderInvoiceExport = new TParkingRecordExport(); + BeanUtils.copyProperties(orderInvoiceVO,orderInvoiceExport); + if (orderInvoiceVO.getFreeDuration()!=null){ + orderInvoiceExport.setParkingDuration(orderInvoiceVO.getParkingDuration()-orderInvoiceVO.getFreeDuration()); + }else{ + orderInvoiceExport.setParkingDuration(orderInvoiceVO.getParkingDuration()); + } + if (orderInvoiceVO.getTimeoutAmount()!=null){ + orderInvoiceExport.setAmount(orderInvoiceVO.getOrderAmount().subtract(orderInvoiceVO.getTimeoutAmount())); + }else{ + orderInvoiceExport.setAmount(orderInvoiceVO.getOrderAmount()); + } + orderInvoiceExports.add(orderInvoiceExport); + } + Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TParkingRecordExport.class, orderInvoiceExports); + HttpServletResponse response = WebUtils.response(); + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + ServletOutputStream outputStream = null; + try { + String fileName = URLEncoder.encode("停车记录.xls", "utf-8"); + response.setHeader("Content-Disposition", "attachment;filename=" + fileName); + response.setContentType("application/vnd.ms-excel;charset=UTF-8"); + response.setHeader("Pragma", "no-cache"); + response.setHeader("Cache-Control", "no-cache"); + outputStream = response.getOutputStream(); + workbook.write(outputStream); + } catch (IOException e) { + e.printStackTrace(); + } finally { + try { + outputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } @ApiOperation(tags = {"后台-订单管理-停车记录"},value = "详情") @GetMapping(value = "/detail") public R<TParkingRecord> detail(Long id) { - return R.ok(parkingRecordService.getById(id)); - } @ApiOperation(tags = {"后台-订单管理-停车记录"},value = "出场") diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/export/TParkingRecordExport.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/export/TParkingRecordExport.java new file mode 100644 index 0000000..a34bb11 --- /dev/null +++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/export/TParkingRecordExport.java @@ -0,0 +1,41 @@ +package com.ruoyi.chargingPile.export; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +@ApiModel(value = "导出充电算帐单-导出") +public class TParkingRecordExport implements Serializable { + + @Excel(name = "账单编号",width = 30) + private String code; + @Excel(name = "站点名称",width = 30) + private String siteName; + @Excel(name = "出场时间",width = 30) + private String outParkingTime; + @Excel(name = "进场时间",width = 30) + private String inParkingTime; + @Excel(name = "车牌号",width = 30) + private String licensePlate; + @Excel(name = "车辆颜色",width = 30) + private String vehicleColor; + @Excel(name = "总费用",width = 30) + private BigDecimal orderAmount; + @Excel(name = "超时占位费",width = 30) + private BigDecimal timeoutAmount; + @Excel(name = "停车费",width = 30) + private BigDecimal amount; + @Excel(name = "免费时长(分钟)",width = 30) + private Integer freeDuration; + @Excel(name = "停车总时长(分钟)",width = 30) + private Integer parkingDuration; + @Excel(name = "收费时长(分钟)",width = 30) + private Integer payDuration; + +} diff --git "a/ruoyi-service/ruoyi-chargingPile/src/main/resources/template/\350\264\246\346\210\267\347\273\223\347\256\227\350\264\246\345\215\225.xlsx" "b/ruoyi-service/ruoyi-chargingPile/src/main/resources/template/\350\264\246\346\210\267\347\273\223\347\256\227\350\264\246\345\215\225.xlsx" new file mode 100644 index 0000000..296d45b --- /dev/null +++ "b/ruoyi-service/ruoyi-chargingPile/src/main/resources/template/\350\264\246\346\210\267\347\273\223\347\256\227\350\264\246\345\215\225.xlsx" Binary files differ diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java index ecba608..4416b85 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java @@ -72,6 +72,17 @@ public R<AccountListVO> accountBillList(@RequestBody ChargingListQuery dto) { AccountListVO accountListVO = new AccountListVO(); ChargingBillVO res = chargingBillService.chargingBillList(dto); + dto.setPageCurr(1); + dto.setPageSize(99999999); + ChargingBillVO res1 = chargingBillService.chargingBillList(dto); + List<ChargingBillListVO> records = res1.getList().getRecords(); + accountListVO.setBillCount(records.size()); + accountListVO.setTotalAmount(res1.getPaymentAmount().subtract(res1.getRefundAmount()).subtract(res1.getCommissionAmount()).subtract(res1.getSharingAmount())); + accountListVO.setPaymentAmount(res1.getPaymentAmount()); + accountListVO.setRefundAmount(res1.getRefundAmount()); + accountListVO.setCommissionAmount(res1.getCommissionAmount()); + accountListVO.setSharingAmount(res1.getSharingAmount()); + accountListVO.setList(res.getList()); return R.ok(accountListVO); } @PostMapping(value = "/chargingBillList") diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java index 309caee..d12f4b6 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java @@ -40,6 +40,7 @@ import com.ruoyi.order.api.query.ChargingOrderQuery; import com.ruoyi.order.api.query.TChargingCountQuery; import com.ruoyi.order.api.query.UploadRealTimeMonitoringDataQuery; +import com.ruoyi.order.api.vo.*; import com.ruoyi.order.api.vo.ChargingOrderInfoVO; import com.ruoyi.order.api.vo.ChargingOrderVO; import com.ruoyi.order.api.vo.GetChargingOrderByLicensePlate; @@ -270,6 +271,7 @@ return chargingOrderService.getRefundList(chargingRefundDto); } + @@ -593,10 +595,10 @@ @ResponseBody @GetMapping(value = "/six/total") @ApiOperation(value = "底部数据分类", tags = {"后台-数据分析-平台收入分析"}) - public R<Map<String,BigDecimal>> total() { + public R<Map<String,Object>> total() { //count近6个月的数据 LocalDate sixBefore = PreviousSixMonths.get(); - Map<String,BigDecimal> map = chargingOrderService.countAll(sixBefore); + Map<String,Object> map = chargingOrderService.countAll(sixBefore); BigDecimal data = parkingLotClient.getRecordAmount(sixBefore).getData(); map.put("parkingAmount",data); BigDecimal data1 = shoppingOrderService.getSumAmount(sixBefore); @@ -668,80 +670,196 @@ -// @ResponseBody -// @PostMapping(value = "/charging/statistics") -// @ApiOperation(value = "统计", tags = {"管理后台-数据分析-充电运营分析"}) -// public R<TCharingOrderVO> watchChargingOrder(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto){ -// List<Integer> siteIds =new ArrayList<>(); -// if (statisticsQueryDto.getSiteId()==null) { -// Long userId = SecurityUtils.getUserId(); -// //获取当前登录的siteIds -// List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData(); -// for (GetSiteListDTO datum : data) { -// siteIds.add(datum.getId()); -// } -// }else { -// siteIds.add(statisticsQueryDto.getSiteId()); -// } -// -// -// LocalDate start = null; -// LocalDate end = null; -// if (statisticsQueryDto.getDayType()==1){ -// start = LocalDate.now(); -// -// }else if (statisticsQueryDto.getDayType()==2){ -// LocalDate today = LocalDate.now(); -// -// // 获取本周一的日期 -// LocalDate mondayThisWeek = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)); -// -// System.out.println("本周一是: " + mondayThisWeek); -// } -// else if (statisticsQueryDto.getDayType()==3){ -// // 获取当前日期 -// LocalDate today = LocalDate.now(); -// -// // 获取本月1号的日期 -// YearMonth yearMonth = YearMonth.from(today); -// start = yearMonth.atDay(1); -// -// System.out.println("本月1号是: " + start); -// }else if (statisticsQueryDto.getDayType()==4){ -// LocalDate today = LocalDate.now(); -// // 获取当前年份 -// int currentYear = today.getYear(); -// // 获取今年1月1日的日期 -// start = LocalDate.of(currentYear, 1, 1); -// System.out.println("今年1月1日是: " + start); -// }else if (statisticsQueryDto.getDayType()==5){ -// -// // 获取今年1月1日的日期 -// start = statisticsQueryDto.getStartTime(); -// end = statisticsQueryDto.getEndTime(); -// } -// List<TChargingOrder> list = chargingOrderService.lambdaQuery().ge(TChargingOrder::getStartTime, start).le(TChargingOrder::getEndTime, end).in(TChargingOrder::getSiteId, siteIds).list(); -// List<Long> chargingOrderIds = list.stream().map(TChargingOrder::getId).collect(Collectors.toList()); -// //上方饼图 -// List<Map<String,BigDecimal>> maps = chargingOrderService.getSumByType(chargingOrderIds); -// -// if (statisticsQueryDto.getDayType()==1){ -// List<Map<String,BigDecimal>> maps1 = chargingOrderService.getDateData(chargingOrderIds); -// -// }else if (statisticsQueryDto.getDayType()==2){ -// List<Map<String,BigDecimal>> maps1 = chargingOrderService.getWeekData(chargingOrderIds); -// }else if (statisticsQueryDto.getDayType()==3){ -// List<Map<String,BigDecimal>> maps1 = chargingOrderService.getMonthData(chargingOrderIds); -// }else if (statisticsQueryDto.getDayType()==4){ -// List<Map<String,BigDecimal>> maps1 = chargingOrderService.getYearData(chargingOrderIds); -// } -// -// -// -// -// -// -// } + @ResponseBody + @PostMapping(value = "/charging/statistics") + @ApiOperation(value = "统计,充电订单分析", tags = {"管理后台-数据分析-充电运营分析"}) + public R<TCharingOrderMapVO> watchChargingOrder(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto){ + List<Integer> siteIds =new ArrayList<>(); + if (statisticsQueryDto.getSiteId()==null) { + Long userId = SecurityUtils.getUserId(); + //获取当前登录的siteIds + List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData(); + for (GetSiteListDTO datum : data) { + siteIds.add(datum.getId()); + } + }else { + siteIds.add(statisticsQueryDto.getSiteId()); + } + TCharingOrderMapVO tCharingOrderMapVO = new TCharingOrderMapVO(); + + + LocalDate start = null; + LocalDate end = null; + if (statisticsQueryDto.getDayType()==1){ + start = LocalDate.now(); + + }else if (statisticsQueryDto.getDayType()==2){ + LocalDate today = LocalDate.now(); + + // 获取本周一的日期 + LocalDate mondayThisWeek = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)); + + System.out.println("本周一是: " + mondayThisWeek); + } + else if (statisticsQueryDto.getDayType()==3){ + // 获取当前日期 + LocalDate today = LocalDate.now(); + + // 获取本月1号的日期 + YearMonth yearMonth = YearMonth.from(today); + start = yearMonth.atDay(1); + + System.out.println("本月1号是: " + start); + }else if (statisticsQueryDto.getDayType()==4){ + LocalDate today = LocalDate.now(); + // 获取当前年份 + int currentYear = today.getYear(); + // 获取今年1月1日的日期 + start = LocalDate.of(currentYear, 1, 1); + System.out.println("今年1月1日是: " + start); + }else if (statisticsQueryDto.getDayType()==5){ + + // 获取今年1月1日的日期 + start = statisticsQueryDto.getStartTime(); + end = statisticsQueryDto.getEndTime(); + } + List<TChargingOrder> list = chargingOrderService.lambdaQuery().ge(TChargingOrder::getStartTime, start).le(TChargingOrder::getEndTime, end).in(TChargingOrder::getSiteId, siteIds).list(); + List<Long> chargingOrderIds = list.stream().map(TChargingOrder::getId).collect(Collectors.toList()); + //上方饼图 + List<Map<String,Object>> maps = chargingOrderService.getSumByType(chargingOrderIds); + + if (statisticsQueryDto.getDayType()==1){ + List<Map<String,Object>> maps1 = chargingOrderService.getDateData(chargingOrderIds); + tCharingOrderMapVO.setMaps1(maps1); + }else if (statisticsQueryDto.getDayType()==2){ + List<Map<String,Object>> maps1 = chargingOrderService.getWeekData(chargingOrderIds); + tCharingOrderMapVO.setMaps1(maps1); + }else if (statisticsQueryDto.getDayType()==3){ + List<Map<String,Object>> maps1 = chargingOrderService.getMonthData(chargingOrderIds); + tCharingOrderMapVO.setMaps1(maps1); + }else if (statisticsQueryDto.getDayType()==4){ + List<Map<String,Object>> maps1 = chargingOrderService.getYearData(chargingOrderIds); + tCharingOrderMapVO.setMaps1(maps1); + }else if (statisticsQueryDto.getDayType()==5){ + List<Map<String,Object>> maps1 = chargingOrderService.getByDate(chargingOrderIds); + tCharingOrderMapVO.setMaps1(maps1); + } + + + tCharingOrderMapVO.setMaps(maps); + + + return R.ok(tCharingOrderMapVO); + + } + + + @ResponseBody + @PostMapping(value = "/charging/power") + @ApiOperation(value = "功率", tags = {"管理后台-数据分析-充电运营分析"}) + public R<TCharingOrderPowerMapVO> power(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto) { + List<Integer> siteIds = new ArrayList<>(); + if (statisticsQueryDto.getSiteId() == null) { + Long userId = SecurityUtils.getUserId(); + //获取当前登录的siteIds + List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData(); + for (GetSiteListDTO datum : data) { + siteIds.add(datum.getId()); + } + } else { + siteIds.add(statisticsQueryDto.getSiteId()); + } + List<Map<String,Object>> maps1 = chargingOrderService.queryPower(siteIds); + + + Map<String,Object> map = chargingOrderService.qureryPowerLevel(siteIds,statisticsQueryDto); + + TCharingOrderPowerMapVO tCharingOrderPowerMapVO = new TCharingOrderPowerMapVO(); + tCharingOrderPowerMapVO.setMaps1(map); + tCharingOrderPowerMapVO.setMaps(maps1); + return R.ok(tCharingOrderPowerMapVO); + + } + + + @ResponseBody + @PostMapping(value = "/charging/users") + @ApiOperation(value = "除电站流量外", tags = {"管理后台-数据分析-充电用户分析"}) + public R<TCharingUserMapVO> users(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto){ + + TCharingUserMapVO tCharingUserMapVO = new TCharingUserMapVO(); + //上方折现 + if (statisticsQueryDto.getDayType()==1){ + List<Map<String,Object>> map = chargingOrderService.usersDay(); + tCharingUserMapVO.setMap(map); + }else { + List<Map<String,Object>> map = chargingOrderService.usersByQuery(statisticsQueryDto); + tCharingUserMapVO.setMap(map); + } + + //用户标签 + List<Map<String,Object>> maps = chargingOrderService.getUserTagCount(); + //会员标签 + List<Map<String,Object>> maps1 = chargingOrderService.getVipCount(); + + //单位消费 + List<Map<String, Object>> untiMap = chargingOrderService.unitConsumption(statisticsQueryDto); + + //车辆用途 + List<Map<String, Object>> carMap = chargingOrderService.carUserMethod(); + //车辆品牌 + List<Map<String, Object>> carBrandMap = chargingOrderService.carUserBrand(); + //本地车数量 + Map<String,Object> localCarMap = chargingOrderService.countLocalCar(); + + + tCharingUserMapVO.setUserMaps(maps); + tCharingUserMapVO.setVipMaps(maps1); + tCharingUserMapVO.setUntiMap(untiMap); + tCharingUserMapVO.setCarMap(carMap); + tCharingUserMapVO.setCarBrandMap(carBrandMap); + tCharingUserMapVO.setLocalCarMap(localCarMap); + return R.ok(tCharingUserMapVO); + + } + @ResponseBody + @PostMapping(value = "/charging/sites") + @ApiOperation(value = "电站评价", tags = {"管理后台-数据分析-充电用户分析"}) + public R<TCharingUserEvaluateVO> sites(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto){ + List<Integer> siteIds =new ArrayList<>(); + if (statisticsQueryDto.getSiteId()==null) { + Long userId = SecurityUtils.getUserId(); + //获取当前登录的siteIds + List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData(); + for (GetSiteListDTO datum : data) { + siteIds.add(datum.getId()); + } + }else { + siteIds.add(statisticsQueryDto.getSiteId()); + } + //查询评价分 + Long aver = chargingOrderService.getAver(siteIds); + //查询各个分数 + List<Map<String,Object>> evaluate = chargingOrderService.getLevelEvaluate(siteIds); + //查询差评回复数 + Long count = orderEvaluateService.lambdaQuery().isNotNull(TOrderEvaluate::getResponseTime).count(); + TCharingUserEvaluateVO tCharingUserEvaluateVO = new TCharingUserEvaluateVO(); + tCharingUserEvaluateVO.setAver(aver); + tCharingUserEvaluateVO.setEvaluate(evaluate); + tCharingUserEvaluateVO.setBlackCount(count); + + + + //标签 + //查出好评ids +// orderEvaluateService.goodTop(); + + + + + //流量 + return R.ok(tCharingUserEvaluateVO); + } public static void main(String[] args) { // 示例数据 @@ -814,8 +932,8 @@ public void excelEndCharge(@RequestParam("code") String code){ chargingOrderService.excelEndCharge(code); } - - + + /** * 根据车牌号和时间查询有效的充电数据 * @param query diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java index 44e1416..e68041c 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java @@ -65,19 +65,46 @@ List<SixCircleDto> circle(@Param("siteIds")List<Integer> siteIds,@Param("sixBefore")LocalDate sixBefore); - Map<String, BigDecimal> countAll(@Param("sixBefore")LocalDate sixBefore); + Map<String, Object> countAll(@Param("sixBefore")LocalDate sixBefore); - List<Map<String, BigDecimal>> getSumByType(@Param("chargingOrderIds")List<Long> chargingOrderIds); + List<Map<String, Object>> getSumByType(@Param("chargingOrderIds")List<Long> chargingOrderIds); - List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds); + List<Map<String, Object>> getDateData(List<Long> chargingOrderIds); - List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds); + List<Map<String, Object>> getWeekData(List<Long> chargingOrderIds); - List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds); + List<Map<String, Object>> getMonthData(List<Long> chargingOrderIds); - List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds); + List<Map<String, Object>> getYearData(List<Long> chargingOrderIds); List<ChargingOrderListVO> chargingList(@Param("pageInfo")PageInfo<ChargingOrderListVO> pageInfo, @Param("req") ChargingListQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2, @Param("endTime1")String endTime1, @Param("endTime2")String endTime2); List<ChargingOrderListVO> chargingList1( @Param("req")ChargingListQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2, @Param("endTime1")String endTime1, @Param("endTime2")String endTime2); + List<Map<String, Object>> getByDate(List<Long> chargingOrderIds); + + List<Map<String, Object>> queryPower(List<Integer> siteIds); + + Map<String, Object> queryPowerLevel(@Param("siteIds") List<Integer> siteIds,@Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto); + + List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds); + + List<Map<String, Object>> usersDay(); + + List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto); + + List<Map<String, Object>> getUserTagCount(); + + List<Map<String, Object>> getVipCount(); + + List<Map<String, Object>> unitConsumption(ChargingStatisticsQueryDto statisticsQueryDto); + + List<Map<String, Object>> carUserMethod(); + + List<Map<String, Object>> carUserBrand(); + + Map<String, Object> countLocalCar(); + + Long getAver(List<Integer> siteIds); + + List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds); } diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java index d62aa72..61aad66 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java @@ -118,17 +118,17 @@ List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore); - Map<String, BigDecimal> countAll(LocalDate sixBefore); + Map<String, Object> countAll(LocalDate sixBefore); - List<Map<String, BigDecimal>> getSumByType(List<Long> chargingOrderIds); + List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds); - List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds); + List<Map<String, Object>> getDateData(List<Long> chargingOrderIds); - List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds); + List<Map<String, Object>> getWeekData(List<Long> chargingOrderIds); - List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds); + List<Map<String, Object>> getMonthData(List<Long> chargingOrderIds); - List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds); + List<Map<String, Object>> getYearData(List<Long> chargingOrderIds); ChargingOrderTimeVO chargingList(ChargingListQuery dto); @@ -157,6 +157,35 @@ */ void excelEndCharge(String orderCode); + List<Map<String, Object>> getByDate(List<Long> chargingOrderIds); + + List<Map<String, Object>> queryPower(List<Integer> siteIds); + + Map<String, Object> qureryPowerLevel(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto); + + List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds); + + List<Map<String, Object>> usersDay(); + + List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto); + + + List<Map<String, Object>> getUserTagCount(); + + List<Map<String, Object>> getVipCount(); + + List<Map<String, Object>> unitConsumption(ChargingStatisticsQueryDto statisticsQueryDto); + + List<Map<String, Object>> carUserMethod(); + + List<Map<String, Object>> carUserBrand(); + + Map<String, Object> countLocalCar(); + + Long getAver(List<Integer> siteIds); + + List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds); + /** * 根据车牌号和开始时间查询充电数据 diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java index e1cf6a0..e72db84 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java @@ -80,6 +80,7 @@ BigDecimal sharingAmountTotal = new BigDecimal("0"); BigDecimal chargingCapacityTotal = new BigDecimal("0"); BigDecimal discountTotal = new BigDecimal("0"); + BigDecimal refundAmount = new BigDecimal("0"); int orderCount = 0; for (ChargingBillListVO chargingBillListVO : list) { String temp = ""; @@ -243,6 +244,9 @@ electrovalence = electrovalence.add(tChargingOrder.getElectrovalence()); electrovalenceTotal = electrovalenceTotal.add(tChargingOrder.getElectrovalence()); } + if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getRefundStatus() == 2){ + refundAmount = refundAmount.add(tChargingOrder.getRefundAmount()); + } // 累加累计服务费 if (tChargingOrder.getServiceCharge()!=null){ serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge()); diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java index 9378d51..3dbf5be 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java @@ -1125,32 +1125,32 @@ } @Override - public Map<String, BigDecimal> countAll(LocalDate sixBefore) { + public Map<String, Object> countAll(LocalDate sixBefore) { return this.baseMapper.countAll(sixBefore); } @Override - public List<Map<String, BigDecimal>> getSumByType(List<Long> chargingOrderIds) { + public List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds) { return this.baseMapper.getSumByType(chargingOrderIds); } @Override - public List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds) { + public List<Map<String, Object>> getDateData(List<Long> chargingOrderIds) { return this.baseMapper.getDateData(chargingOrderIds); } @Override - public List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds) { + public List<Map<String, Object>> getWeekData(List<Long> chargingOrderIds) { return this.baseMapper.getWeekData(chargingOrderIds); } @Override - public List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds) { + public List<Map<String, Object>> getMonthData(List<Long> chargingOrderIds) { return this.baseMapper.getMonthData(chargingOrderIds); } @Override - public List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds) { + public List<Map<String, Object>> getYearData(List<Long> chargingOrderIds) { return this.baseMapper.getYearData(chargingOrderIds); } @Resource @@ -1556,6 +1556,75 @@ endCharge(orderCode, 0); } + @Override + public List<Map<String, Object>> getByDate(List<Long> chargingOrderIds) { + return this.baseMapper.getByDate(chargingOrderIds); + } + + @Override + public List<Map<String, Object>> queryPower(List<Integer> siteIds) { + return this.baseMapper.queryPower(siteIds); + } + + @Override + public Map<String, Object> qureryPowerLevel(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto) { + return this.baseMapper.queryPowerLevel(siteIds,statisticsQueryDto); + } + + @Override + public List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds) { + return this.baseMapper.queryOrderCountAndMoneyBySiteIdDate(siteIds); + } + + @Override + public List<Map<String, Object>> usersDay() { + return this.baseMapper.usersDay(); + } + + @Override + public List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto) { + return this.baseMapper.usersByQuery(statisticsQueryDto); + } + + @Override + public List<Map<String, Object>> getUserTagCount() { + return this.baseMapper.getUserTagCount(); + } + + @Override + public List<Map<String, Object>> getVipCount() { + return this.baseMapper.getVipCount(); + } + + @Override + public List<Map<String, Object>> unitConsumption(ChargingStatisticsQueryDto statisticsQueryDto) { + return this.baseMapper.unitConsumption(statisticsQueryDto); + } + + @Override + public List<Map<String, Object>> carUserMethod() { + return this.baseMapper.carUserMethod(); + } + + @Override + public List<Map<String, Object>> carUserBrand() { + return this.baseMapper.carUserBrand(); + } + + @Override + public Map<String, Object> countLocalCar() { + return this.baseMapper.countLocalCar(); + } + + @Override + public Long getAver(List<Integer> siteIds) { + return this.baseMapper.getAver(siteIds); + } + + @Override + public List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds) { + return this.baseMapper.getLevelEvaluate(siteIds); + } @Override diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java index 53d4fb7..2e2f137 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java @@ -79,6 +79,6 @@ giveVipDto.setUserIds(tVipOrder.getAppUserId().toString()); giveVipDto.setVipId(tVipOrder.getVipId()); giveVipDto.setType(tVipOrder.getVipType()); -// vipClient.giveVip(giveVipDto); + vipClient.giveVip(giveVipDto); } } diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml index fa7da27..af8dd8f 100644 --- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml +++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml @@ -358,7 +358,8 @@ SELECT DATE_FORMAT( create_time, '%Y-%m-%d %H' ) as time, SUM(service_charge) as servicecharge, - SUM(electrovalence) as electrovalence + SUM(electrovalence) as electrovalence, + count(1) as orderCount FROM t_charging_order <where> @@ -380,7 +381,8 @@ SELECT DATE_FORMAT( create_time, '%Y-%m-%d' ) as time, SUM(service_charge) as servicecharge, - SUM(electrovalence) as electrovalence + SUM(electrovalence) as electrovalence, + count(1) as orderCount FROM t_charging_order <where> @@ -402,7 +404,8 @@ SELECT DATE_FORMAT( create_time, '%Y-%m-%d' ) as time, SUM(service_charge) as servicecharge, - SUM(electrovalence) as electrovalence + SUM(electrovalence) as electrovalence, + count(1) as orderCount FROM t_charging_order <where> @@ -424,7 +427,8 @@ SELECT DATE_FORMAT( create_time, '%Y-%m-%d' ) as time, SUM(service_charge) as servicecharge, - SUM(electrovalence) as electrovalence + SUM(electrovalence) as electrovalence, + count(1) as orderCount FROM t_charging_order <where> @@ -443,6 +447,337 @@ </select> + <select id="getByDate" resultType="java.util.Map"> + SELECT + DATE_FORMAT( create_time, '%Y-%m-%d' ) as time, + SUM(service_charge) as servicecharge, + SUM(electrovalence) as electrovalence, + count(1) as orderCount + FROM + t_charging_order + <where> + del_flag = 0 and recharge_payment_status = 2 and ISNULL(refund_status) + <if test="chargingOrderIds != null and chargingOrderIds.size() > 0"> + AND id IN + <foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")"> + #{chargingOrderId} + </foreach> + </if> + </where> + GROUP BY + time + ORDER BY + time + + </select> + <select id="queryPower" resultType="java.util.Map"> + SELECT + 'today' AS data_type, + DATE_FORMAT(create_time, '%Y-%m-%d %H') AS TIME, + SUM(power) AS power + FROM + t_charging_order + WHERE + del_flag = 0 + AND recharge_payment_status = 2 + AND ISNULL(refund_status) + AND DATE(create_time) = CURDATE() + <if test="siteIds != null and siteIds.size() > 0"> + AND site_id IN + <foreach collection="siteIds" item="siteId" open="(" separator="," close=")"> + #{siteId} + </foreach> + </if> + GROUP BY + TIME + + UNION ALL + + SELECT + 'yesterday' AS data_type, + DATE_FORMAT(create_time, '%Y-%m-%d %H') AS TIME, + SUM(power) AS power + FROM + t_charging_order + WHERE + del_flag = 0 + AND recharge_payment_status = 2 + AND ISNULL(refund_status) + AND DATE(create_time) = CURDATE() - INTERVAL 1 DAY + <if test="siteIds != null and siteIds.size() > 0"> + AND site_id IN + <foreach collection="siteIds" item="siteId" open="(" separator="," close=")"> + #{siteId} + </foreach> + </if> + GROUP BY + TIME + + ORDER BY + TIME; + + + </select> + <select id="queryPowerLevel" resultType="java.util.Map"> + SELECT + count(CASE WHEN power BETWEEN 0 AND 30 THEN 1 ELSE 0 END) AS count_0_30, + count(CASE WHEN power BETWEEN 31 AND 60 THEN 1 ELSE 0 END) AS count_31_60, + count(CASE WHEN power BETWEEN 61 AND 120 THEN 1 ELSE 0 END) AS count_61_120, + count(CASE WHEN power BETWEEN 121 AND 300 THEN 1 ELSE 0 END) AS count_121_300, + count(CASE WHEN power > 300 THEN 1 ELSE 0 END) AS count_above_300 + FROM + t_charging_order + WHERE + del_flag = 0 + AND recharge_payment_status = 2 + AND ISNULL(refund_status) + <if test="siteIds != null and siteIds.size() > 0"> + AND site_id IN + <foreach collection="siteIds" item="siteId" open="(" separator="," close=")"> + #{siteId} + </foreach> + </if> + <if test="statisticsQueryDto.dayType =1"> + AND DATE(create_time) = CURDATE() + </if> + <if test="statisticsQueryDto.dayType =2"> + AND WEEKOFYEAR(create_time) = WEEKOFYEAR(CURDATE()) + </if> + <if test="statisticsQueryDto.dayType =3"> + AND MONTH(create_time) = MONTH(CURDATE()) + </if> + <if test="statisticsQueryDto.dayType =4"> + AND YEAR(create_time) = YEAR(CURDATE()) + </if> + <if test="statisticsQueryDto.dayType =5"> + <if test="statisticsQueryDto.startTime != null"> + AND create_time >= #{statisticsQueryDto.startTime} + </if> + <if test="statisticsQueryDto.endTime != null"> + AND create_time <= #{statisticsQueryDto.endTime} + </if> + </if> + + </select> + <select id="usersDay" resultType="java.util.Map"> + SELECT + 'today' AS data_type, + '1' as type, + DATE_FORMAT( create_time, '%Y-%m-%d %H' ) AS TIME, + count(DISTINCT app_user_id) AS counts + FROM + t_charging_order + WHERE + del_flag = 0 + AND recharge_payment_status = 2 + AND ISNULL( refund_status ) + AND DATE ( create_time ) = CURDATE() + GROUP BY + TIME + UNION all + SELECT + 'today' AS data_type, + '2' as type, + DATE_FORMAT( create_time, '%Y-%m-%d %H' ) AS TIME, + count(1) AS counts + FROM + charging_pile_account.t_app_user + WHERE + del_flag = 0 + AND DATE ( create_time ) = CURDATE() + GROUP BY + TIME + </select> + <select id="usersByQuery" resultType="java.util.Map"> + SELECT + 'today' AS data_type, + '1' as type, + DATE_FORMAT( create_time, '%Y-%m-%d' ) AS TIME, + count(DISTINCT app_user_id) AS counts + FROM + t_charging_order + WHERE + del_flag = 0 + AND recharge_payment_status = 2 + AND ISNULL( refund_status ) + <if test="statisticsQueryDto.dayType =1 "> + AND DATE(create_time) = CURDATE() + </if> + <if test="statisticsQueryDto.dayType =2 "> + AND WEEKOFYEAR(create_time) = WEEKOFYEAR(CURDATE()) + </if> + <if test="statisticsQueryDto.dayType =3 "> + AND MONTH(create_time) = MONTH(CURDATE()) + </if> + <if test="statisticsQueryDto.dayType =4"> + AND YEAR(create_time) = YEAR(CURDATE()) + </if> + <if test="statisticsQueryDto.dayType =5"> + <if test="statisticsQueryDto.startTime != null"> + AND create_time >= #{statisticsQueryDto.startTime} + </if> + <if test="statisticsQueryDto.endTime != null"> + AND create_time <= #{statisticsQueryDto.endTime} + </if> + </if> + GROUP BY + TIME + UNION all + SELECT + 'today' AS data_type, + '2' as type, + DATE_FORMAT( create_time, '%Y-%m-%d' ) AS TIME, + count(1) AS counts + FROM + charging_pile_account.t_app_user + WHERE + del_flag = 0 + <if test="statisticsQueryDto.dayType =1 "> + AND DATE(create_time) = CURDATE() + </if> + <if test="statisticsQueryDto.dayType =2 "> + AND WEEKOFYEAR(create_time) = WEEKOFYEAR(CURDATE()) + </if> + <if test="statisticsQueryDto.dayType =3 "> + AND MONTH(create_time) = MONTH(CURDATE()) + </if> + <if test="statisticsQueryDto.dayType =4"> + AND YEAR(create_time) = YEAR(CURDATE()) + </if> + <if test="statisticsQueryDto.dayType =5"> + <if test="statisticsQueryDto.startTime != null"> + AND create_time >= #{statisticsQueryDto.startTime} + </if> + <if test="statisticsQueryDto.endTime != null"> + AND create_time <= #{statisticsQueryDto.endTime} + </if> + </if> + GROUP BY + TIME + + + </select> + <select id="getUserTagCount" resultType="java.util.Map"> + SELECT user_tag_id,COUNT(1) as count from ( + SELECT + a.app_user_id, + a.user_tag_id, + a.create_time + FROM + charging_pile_account.t_app_user_tag a + JOIN ( + SELECT + app_user_id, + MAX(create_time) AS max_create_time + FROM + charging_pile_account.t_app_user_tag + GROUP BY + app_user_id + ) b ON a.app_user_id = b.app_user_id AND a.create_time = b.max_create_time + ) o + GROUP BY o.user_tag_id + </select> + <select id="getVipCount" resultType="java.util.Map"> + SELECT vip_id,count(1) as Counts + FROM charging_pile_account.t_app_user + WHERE del_flag = 0 + GROUP BY vip_id + </select> + <select id="unitConsumption" resultType="java.util.Map"> + SELECT + au.company_id as companyId, + SUM( co.charging_capacity ) as chargingCapacity + FROM + charging_pile_order.t_charging_order co + LEFT JOIN charging_pile_account.t_app_user au ON co.app_user_id = au.id + <where> + co.del_flag = 0 + <if test="statisticsQueryDto.dayType == 1"> + AND DATE( co.create_time ) = CURDATE() + </if> + <if test="statisticsQueryDto.dayType == 2"> + AND WEEKOFYEAR( co.create_time ) = WEEKOFYEAR( CURDATE() ) + </if> + <if test="statisticsQueryDto.dayType == 3"> + AND MONTH( co.create_time ) = MONTH(CURDATE()) + </if> + <if test="statisticsQueryDto.dayType == 4"> + AND YEAR( co.create_time ) = YEAR(CURDATE() ) + </if> + <if test="statisticsQueryDto.dayType == 5"> + <if test="statisticsQueryDto.startTime != null"> + AND co.create_time >= #{statisticsQueryDto.startTime} + </if> + <if test="statisticsQueryDto.endTime != null"> + AND co.create_time <= #{statisticsQueryDto.endTime} + </if> + </if> + </where> + GROUP BY + au.company_id + </select> + <select id="carUserMethod" resultType="java.util.Map"> + SELECT + count(1) as counts,vehicle_use + from charging_pile_account.t_app_user_car + GROUP BY vehicle_use + </select> + <select id="carUserBrand" resultType="java.util.Map"> + + SELECT + count(1) as counts,vehicle_brand + from charging_pile_account.t_app_user_car + GROUP BY vehicle_brand + </select> + <select id="countLocalCar" resultType="java.util.Map"> + SELECT + SUM(CASE WHEN license_plate LIKE '%川J%' THEN 1 ELSE 0 END) AS localCar, + SUM(CASE WHEN license_plate NOT LIKE '%川J%' THEN 1 ELSE 0 END) AS notLocalCar + FROM + `charging_pile_account`.`t_app_user_car` + WHERE + del_flag = 0 + </select> + <select id="getAver" resultType="java.lang.Long"> + SELECT + ROUND(AVG(te.mark), 2) AS average_mark + FROM + `t_order_evaluate` te + LEFT JOIN t_charging_order co on te.order_id = co.id + WHERE + <if test="siteIds != null and siteIds.size() > 0"> + AND co.site_id IN + <foreach collection="siteIds" item="siteId" open="(" separator="," close=")"> + #{siteId} + </foreach> + </if> + te.del_flag = 0 + + </select> + <select id="getLevelEvaluate" resultType="java.util.Map"> + SELECT + CASE + WHEN te.mark BETWEEN 1 AND 2 THEN '1-2' + WHEN te.mark = 3 THEN '3' + WHEN te.mark BETWEEN 4 AND 5 THEN '4-5' + ELSE 'Other' + END AS score_range, + COUNT(*) AS count + FROM + `t_order_evaluate` te + LEFT JOIN t_charging_order co on te.order_id = co.id + WHERE + te.del_flag = 0 + <if test="siteIds != null and siteIds.size() > 0"> + AND co.site_id IN + <foreach collection="siteIds" item="siteId" open="(" separator="," close=")"> + #{siteId} + </foreach> + </if> + GROUP BY + score_range + + </select> <select id="chargingList" resultType="com.ruoyi.order.api.vo.ChargingOrderListVO"> select t1.* from t_charging_order t1 where 1=1 -- Gitblit v1.7.1