From 5e8d5b44b21f5cb5f0f6a504f3a6f7f18200fdde Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 九月 2024 18:20:03 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 194 +++++++++++++++++++++++++-------------
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java | 2
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java | 9 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java | 2
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ExportUidDto.java | 19 +++
ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java | 2
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java | 21 ++--
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java | 2
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 2
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 2
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 6
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingBillMapper.xml | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java | 3
13 files changed, 175 insertions(+), 91 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java
index 4204334..28b7ba4 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java
@@ -35,7 +35,7 @@
private BigDecimal loss_of_charging_degree; // 计损充电度数，精确到小数点后四位；待机置零，未设置计损比例时等于充电度数
private BigDecimal paid_amount; // 已充金额，精确到小数点后四位；待机置零（电费+服务费）*计损充电度数
private Integer hardware_fault; // 硬件故障（1：急停按钮动作故障；2：无可用整流模块；3：出风口温度过高；4：交流防雷故障；5：交直流模块 DC20 通信中断；6：绝缘检测模块 FC08 通信中断；7：电度表通信中断；8：读卡器通信中断；9：RC10 通信中断；10：风扇调速板故障；11：直流熔断器故障；12：高压接触器故障；13：门打开）
-
+ private String createTime; // 格式化时间格式
private BigDecimal electrovalence_all;// @ApiModelProperty("时段电价")
private BigDecimal service_charge;//@ApiModelProperty("时段服务费单价")
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ExportUidDto.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ExportUidDto.java
new file mode 100644
index 0000000..b67d91f
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ExportUidDto.java
@@ -0,0 +1,19 @@
+package com.ruoyi.order.api.model;
+
+import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("充电时段统计DTO")
+public class ExportUidDto {
+
+ @ApiModelProperty("uid")
+ private String uid;
+ @ApiModelProperty("时间")
+ private String time;
+
+}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index 5cfac91..32ff8f4 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -159,7 +159,7 @@
@TableField("refund_code")
private String refundCode;
@ApiModelProperty(value = "退款原因")
- @TableField("refund_reason")
+ @TableField(exist = false)
private String refundReason;
@ApiModelProperty(value = "退款金额")
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
index 286972a..051ce98 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
@@ -14,6 +14,8 @@
public class ChargingOrderListVO {
@ApiModelProperty(value = "电站名称")
private String siteName;
+ @ApiModelProperty(value = "订单状态")
+ private Integer status;
@ApiModelProperty(value = "电站id")
private Integer siteId;
@ApiModelProperty(value = "充电桩id")
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java
index 4689357..caa9314 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java
@@ -23,6 +23,9 @@
private Integer pageSize = 10;
public Integer getPageCurr() {
+ if(null != pageCurr){
+ pageCurr = (pageCurr - 1) * pageSize;
+ }
return pageCurr;
}
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..29c62c9 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,6 +7,7 @@
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.model.ExportUidDto;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TSettlementConfirm;
import com.ruoyi.order.api.vo.ChargingBillListVO;
@@ -243,11 +244,11 @@
}
@ApiOperation(value = "下载-已出账", tags = {"管理后台-充电算账单"})
- @GetMapping("/downloadBill")
- public R downloadBill(String uid,HttpServletResponse response)
+ @PutMapping("/downloadBill")
+ public R downloadBill(@RequestBody ExportUidDto uid, HttpServletResponse response)
{
ChargingListQuery chargingListQuery = new ChargingListQuery();
- chargingListQuery.setUid(uid);
+ chargingListQuery.setUid(uid.getUid());
chargingListQuery.setPageCurr(1);
chargingListQuery.setPageSize(99999);
ChargingBillVO data = chargingOrderClient.chargingBillListR(chargingListQuery).getData();
@@ -283,10 +284,10 @@
return R.ok();
}
@ApiOperation(value = "导出", tags = {"管理后台-结算汇总表"})
- @GetMapping("/downloadSettlementTotal")
- public R downloadSettlementTotal(String time,HttpServletResponse response)
+ @PutMapping("/downloadSettlementTotal")
+ public R downloadSettlementTotal(@RequestBody ExportUidDto uid,HttpServletResponse response)
{
- SettlementTotalVO data = chargingOrderClient.settlementTotalR(time).getData();
+ SettlementTotalVO data = chargingOrderClient.settlementTotalR(uid.getTime()).getData();
try {
@@ -318,10 +319,10 @@
return R.ok();
}
@ApiOperation(value = "下载", tags = {"管理后台-结算表记录"})
- @GetMapping("/downloadSettlement")
- public R downloadSettlement(String uid,HttpServletResponse response)
+ @PutMapping("/downloadSettlement")
+ public R downloadSettlement(@RequestBody ExportUidDto uid,HttpServletResponse response)
{
- TSettlementConfirm data = chargingOrderClient.downloadSettlement(uid).getData();
+ TSettlementConfirm data = chargingOrderClient.downloadSettlement(uid.getUid()).getData();
List<Site> data1 = siteClient.getSiteByIds(Arrays.asList(data.getSiteId())).getData();
if (!data1.isEmpty()){
data.setSiteName(data1.get(0).getName());
@@ -370,7 +371,7 @@
@ApiOperation(value = "下载-未出账", tags = {"管理后台-充电算账单"})
- @GetMapping("/download")
+ @PutMapping("/download")
public R download(String uid,HttpServletResponse response)
{
ChargingListQuery chargingListQuery = new ChargingListQuery();
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..8209c18 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
@@ -15,6 +15,7 @@
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.model.ExportUidDto;
import com.ruoyi.order.api.model.TChargingBill;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.query.TOrderInvoiceQuery;
@@ -90,7 +91,7 @@
return R.ok(null);
}
@ApiOperation(value = "导出", tags = {"管理后台-充电算账单"})
- @PostMapping("/export")
+ @PutMapping("/export")
public void export(@RequestBody ChargingListQuery dto)
{
ChargingBillVO res = chargingBillService.chargingBillList(dto);
@@ -153,13 +154,13 @@
}
}
@ApiOperation(value = "下载-未出账", tags = {"管理后台-充电算账单"})
- @GetMapping("/download")
- public void download(String uid)
+ @PutMapping("/download")
+ public void download(@RequestBody ExportUidDto uid)
{
List<ChargingBillExport> chargingBillExports = new ArrayList<>();
List<ChargingBillRefundExport> chargingBillRefundExports = new ArrayList<>();
List<ChargingBillPayExport> chargingBillPayExports = new ArrayList<>();
- TChargingBill byId = chargingBillService.getById(uid);
+ TChargingBill byId = chargingBillService.getById(uid.getUid());
ChargingBillExport chargingBillExport = new ChargingBillExport();
chargingBillExport.setCode(byId.getCode());
// todo 确认商户类型
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
index 569f7f2..efb4d7f 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -81,7 +81,7 @@
return AjaxResult.success(res);
}
@ApiOperation(value = "充电时段统计-导出", tags = {"管理后台-财务结算"})
- @PostMapping("/export")
+ @PutMapping("/export")
public void export(@RequestBody ChargingListQuery dto)
{
ChargingOrderTimeVO res = chargingOrderService.chargingList(dto);
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..f16019c 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
@@ -78,6 +78,6 @@
List<Map<String, BigDecimal>> 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<ChargingOrderListVO> chargingListNoPage( @Param("req")ChargingListQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2, @Param("endTime1")String endTime1, @Param("endTime2")String endTime2);
}
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 4bc99b4..8183576 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
@@ -1184,10 +1184,12 @@
if (!data.isEmpty()) {
chargingOrderListVO.setSiteName(data.get(0).getName());
}
- TChargingGun data1 = chargingGunClient.getChargingGunById(chargingOrderListVO.getChargingGunId()).getData();
- TChargingPile data2 = chargingPileClient.getChargingPileById(chargingOrderListVO.getChargingPileId()).getData();
- if (data2 != null && data1 != null) {
- chargingOrderListVO.setTerminalName(data2.getName() + "-" + data1.getName());
+ if (chargingOrderListVO.getChargingGunId()!=null && chargingOrderListVO.getChargingPileId()!=null){
+ TChargingGun data1 = chargingGunClient.getChargingGunById(chargingOrderListVO.getChargingGunId()).getData();
+ TChargingPile data2 = chargingPileClient.getChargingPileById(chargingOrderListVO.getChargingPileId()).getData();
+ if (data2 != null && data1 != null) {
+ chargingOrderListVO.setTerminalName(data2.getName() + "-" + data1.getName());
+ }
}
// 获取充电时间
UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrderListVO.getCode()).getData();
@@ -1198,20 +1200,30 @@
}
}
// 获取开始SOC 结束soc
- List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrderListVO.getCode()).getData();
- if (!data6.isEmpty()){
- // 第一条数据soc为开始 最后一条数据soc为结束soc
- chargingOrderListVO.setStartSoc(data6.get(0).getSoc().toString());
- chargingOrderListVO.setEndSoc(data6.get(data6.size()-1).getSoc().toString());
+ if (chargingOrderListVO.getCode()!=null){
+ List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrderListVO.getCode()).getData();
+ if (!data6.isEmpty()){
+ // 第一条数据soc为开始 最后一条数据soc为结束soc
+ chargingOrderListVO.setStartSoc(data6.get(0).getSoc().toString());
+ chargingOrderListVO.setEndSoc(data6.get(data6.size()-1).getSoc().toString());
+ }
}
- TAppUser data3 = appUserClient.getUserById(chargingOrderListVO.getAppUserId()).getData();
- List<Long> carId = new ArrayList<>();
- if (chargingOrderListVO.getAppUserCarId() != null) {
- carId.add(chargingOrderListVO.getAppUserCarId());
- List<TAppUserCar> data4 = appUserCarClient.getCarByIds(carId).getData();
- if (!data4.isEmpty()) chargingOrderListVO.setLicensePlate(data4.get(0).getLicensePlate());
+
+ if (chargingOrderListVO.getAppUserId()!=null){
+ TAppUser data3 = appUserClient.getUserById(chargingOrderListVO.getAppUserId()).getData();
+ List<Long> carId = new ArrayList<>();
+ if (data3!=null){
+ if (chargingOrderListVO.getAppUserCarId() != null) {
+ carId.add(chargingOrderListVO.getAppUserCarId());
+ if (!carId.isEmpty()){
+ List<TAppUserCar> data4 = appUserCarClient.getCarByIds(carId).getData();
+ if (!data4.isEmpty()) chargingOrderListVO.setLicensePlate(data4.get(0).getLicensePlate());
+ }
+ }
+ if (data3 != null) chargingOrderListVO.setPhone(data3.getPhone());
+
+ }
}
- if (data3 != null) chargingOrderListVO.setPhone(data3.getPhone());
List<TChargingOrderAccountingStrategy> list2 = chargingOrderAccountingStrategyService.lambdaQuery()
.eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrderListVO.getId()).list();
// 尖峰平谷充电量 度数
@@ -1237,14 +1249,24 @@
}
}
total = total.add(jian).add(feng).add(ping).add(gu);
- chargingOrderListVO.setElectronicProportion(
- jian.divide(total,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%(尖)/"
- +feng.divide(total,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%(峰)/"
- +ping.divide(total,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%(平)/"
- +gu.divide(total,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%(谷)");
+ if (total.compareTo(new BigDecimal("0")) != 0){
+ chargingOrderListVO.setElectronicProportion(
+ jian.divide(total,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%(尖)/"
+ +feng.divide(total,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%(峰)/"
+ +ping.divide(total,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%(平)/"
+ +gu.divide(total,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%(谷)");
+ }else{
+ chargingOrderListVO.setElectronicProportion(
+ "0"+"%(尖)/"+
+ "0"+"%(峰)/"+
+ "0"+"%(平)/"+
+ "0"+"%(谷)");
+ }
+
}
// 不分页
- List<ChargingOrderListVO> list1 = this.baseMapper.chargingList1(dto,startTime1,startTime2,endTime1,endTime2);
+ PageInfo<ChargingOrderListVO> pageInfo1 = new PageInfo<>(1,999999999);
+ List<ChargingOrderListVO> list1 = this.baseMapper.chargingList(pageInfo1,dto,startTime1,startTime2,endTime1,endTime2);
chargingOrderTimeVO.setExportList(list1);
chargingOrderTimeVO.setOrderCount(list1.size());
// 计算充电总度数
@@ -1271,33 +1293,34 @@
BigDecimal ping = new BigDecimal("0");
BigDecimal gu = new BigDecimal("0");
for (ChargingOrderListVO chargingOrderListVO : list1) {
- electronic = electronic.add(chargingOrderListVO.getChargingCapacity());
- paymentAmount = paymentAmount.add(chargingOrderListVO.getPaymentAmount());
- electrovalence = electrovalence.add(chargingOrderListVO.getElectrovalence());
- serviceCharge = serviceCharge.add(chargingOrderListVO.getServiceCharge());
+ if (chargingOrderListVO.getChargingCapacity()!=null)electronic = electronic.add(chargingOrderListVO.getChargingCapacity());
+
+ if (chargingOrderListVO.getPaymentAmount()!=null)paymentAmount = paymentAmount.add(chargingOrderListVO.getPaymentAmount());
+ if (chargingOrderListVO.getElectrovalence()!=null)electrovalence = electrovalence.add(chargingOrderListVO.getElectrovalence());
+ if (chargingOrderListVO.getServiceCharge()!=null)serviceCharge = serviceCharge.add(chargingOrderListVO.getServiceCharge());
List<TChargingOrderAccountingStrategy> list2 = chargingOrderAccountingStrategyService.lambdaQuery()
.eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrderListVO.getId()).list();
for (TChargingOrderAccountingStrategy temp : list2) {
switch (temp.getType()){
case 1:
- jian = jian.add(temp.getChargingCapacity());
- jianElectronic = jianElectronic.add(temp.getChargingCapacity());
- jianService = jianService.add(temp.getChargingCapacity());
+ if (temp.getChargingCapacity()!=null)jian = jian.add(temp.getChargingCapacity());
+ if (temp.getChargingCapacity()!=null)jianElectronic = jianElectronic.add(temp.getElectrovalence());
+ if (temp.getChargingCapacity()!=null)jianService = jianService.add(temp.getServiceCharge());
break;
case 2:
- feng = feng.add(temp.getChargingCapacity());
- fengElectronic = fengElectronic.add(temp.getChargingCapacity());
- fengService = fengService.add(temp.getChargingCapacity());
+ if (temp.getChargingCapacity()!=null)feng = feng.add(temp.getChargingCapacity());
+ if (temp.getChargingCapacity()!=null)fengElectronic = fengElectronic.add(temp.getElectrovalence());
+ if (temp.getChargingCapacity()!=null)fengService = fengService.add(temp.getServiceCharge());
break;
case 3:
- ping = ping.add(temp.getChargingCapacity());
- pingElectronic = pingElectronic.add(temp.getChargingCapacity());
- pingService = pingService.add(temp.getChargingCapacity());
+ if (temp.getChargingCapacity()!=null)ping = ping.add(temp.getChargingCapacity());
+ if (temp.getChargingCapacity()!=null)pingElectronic = pingElectronic.add(temp.getElectrovalence());
+ if (temp.getChargingCapacity()!=null)pingService = pingService.add(temp.getServiceCharge());
break;
case 4:
- gu = gu.add(temp.getChargingCapacity());
- guElectronic = guElectronic.add(temp.getChargingCapacity());
- guService = guService.add(temp.getChargingCapacity());
+ if (temp.getChargingCapacity()!=null)gu = gu.add(temp.getChargingCapacity());
+ if (temp.getChargingCapacity()!=null)guElectronic = guElectronic.add(temp.getElectrovalence());
+ if (temp.getChargingCapacity()!=null)guService = guService.add(temp.getServiceCharge());
break;
}
}
@@ -1313,21 +1336,40 @@
BigDecimal add1 = jianService.add(fengService).add(pingService).add(guService);
// 计算尖峰平谷充电到账占比
BigDecimal add2 = jian.add(feng).add(ping).add(gu);
- chargingOrderTimeVO.setCapacityProportion(jianElectronic+"度/"+fengElectronic+"度/"+pingElectronic+"度/"+guElectronic+"度-"
- +jianElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
- +fengElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
- +pingElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
- +guElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%");
- chargingOrderTimeVO.setServiceProportion(jianService+"元/"+fengService+"元/"+pingService+"元/"+guService+"元-"
- +jianService.divide(add1,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
- +fengService.divide(add1,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
- +pingService.divide(add1,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
- +guService.divide(add1,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%");
- chargingOrderTimeVO.setElectronicProportion(jian+"元/"+feng+"元/"+ping+"元/"+gu+"元-"
- +jian.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
- +feng.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
- +ping.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
- +gu.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%");
+ if (add.compareTo(new BigDecimal("0"))!=0){
+ chargingOrderTimeVO.setCapacityProportion(jianElectronic+"度/"+fengElectronic+"度/"+pingElectronic+"度/"+guElectronic+"度-"
+ +jianElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+ +fengElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+ +pingElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+ +guElectronic.divide(add,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%");
+ chargingOrderTimeVO.setServiceProportion(jianService+"元/"+fengService+"元/"+pingService+"元/"+guService+"元-"
+ +jianService.divide(add1,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+ +fengService.divide(add1,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+ +pingService.divide(add1,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+ +guService.divide(add1,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%");
+ chargingOrderTimeVO.setElectronicProportion(jian+"元/"+feng+"元/"+ping+"元/"+gu+"元-"
+ +jian.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+ +feng.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+ +ping.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%/"
+ +gu.divide(add2,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))+"%");
+ }else{
+ chargingOrderTimeVO.setCapacityProportion(jianElectronic+"度/"+fengElectronic+"度/"+pingElectronic+"度/"+guElectronic+"度-"
+ +"0"+"%/"
+ +"0"+"%/"
+ +"0"+"%/"
+ +"0"+"%");
+ chargingOrderTimeVO.setServiceProportion(jianService+"元/"+fengService+"元/"+pingService+"元/"+guService+"元-"
+ +"0"+"%/"
+ +"0"+"%/"
+ +"0"+"%/"
+ +"0"+"%");
+ chargingOrderTimeVO.setElectronicProportion(jian+"元/"+feng+"元/"+ping+"元/"+gu+"元-"
+ +"0"+"%/"
+ +"0"+"%/"
+ +"0"+"%/"
+ +"0"+"%");
+ }
+ pageInfo.setRecords(list);
chargingOrderTimeVO.setList(pageInfo);
return chargingOrderTimeVO;
}
@@ -1348,33 +1390,47 @@
chargingOrderListInfoVO.setSiteName(data.get(0).getName());
chargingOrderListInfoVO.setSiteAddress(data.get(0).getAddress());
}
- TChargingGun data1 = chargingGunClient.getChargingGunById(chargingOrder.getChargingGunId()).getData();
- TChargingPile data2 = chargingPileClient.getChargingPileById(data1.getChargingPileId()).getData();
-
- if (data1!=null){
- chargingOrderListInfoVO.setGunCode(data1.getCode());
- chargingOrderListInfoVO.setTerminalName(data2.getName()+data1.getName());
+ if (chargingOrder.getChargingGunId()!=null){
+ TChargingGun data1 = chargingGunClient.getChargingGunById(chargingOrder.getChargingGunId()).getData();
+ if (data1!=null){
+ TChargingPile data2 = chargingPileClient.getChargingPileById(data1.getChargingPileId()).getData();
+ if (data2!=null){
+ chargingOrderListInfoVO.setGunCode(data1.getCode());
+ chargingOrderListInfoVO.setTerminalName(data2.getName()+data1.getName());
+ }
+ }
}
+
chargingOrderListInfoVO.setEndMode(chargingOrder.getEndMode());
- // 获取开始SOC 结束soc
- List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrder.getCode()).getData();
- if (!data6.isEmpty()){
- // 第一条数据soc为开始 最后一条数据soc为结束soc
- chargingOrderListInfoVO.setStartSoc(data6.get(0).getSoc().toString());
- chargingOrderListInfoVO.setEndSoc(data6.get(data6.size()-1).getSoc().toString());
- chargingOrderListInfoVO.setChargingCapacity(data6.get(data6.size()-1).getCharging_degree());
- chargingOrderListInfoVO.setChargingSecond(data6.get(data6.size()-1).getCumulative_charging_time()*60+"");
+ // 获取开始SOC 结束soc
+ if (chargingOrder.getCode()!=null){
+ List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrder.getCode()).getData();
+ if (data6!=null){
+ if (!data6.isEmpty()){
+ // 第一条数据soc为开始 最后一条数据soc为结束soc
+ chargingOrderListInfoVO.setStartSoc(data6.get(0).getSoc().toString());
+ chargingOrderListInfoVO.setEndSoc(data6.get(data6.size()-1).getSoc().toString());
+ chargingOrderListInfoVO.setChargingCapacity(data6.get(data6.size()-1).getCharging_degree());
+ chargingOrderListInfoVO.setChargingSecond(data6.get(data6.size()-1).getCumulative_charging_time()*60+"");
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : data6) {
+ uploadRealTimeMonitoringData.setCreateTime(simpleDateFormat.format(uploadRealTimeMonitoringData.getCreate_time()));
+ }
+ }
+ }
+ chargingOrderListInfoVO.setList(data6);
}
+
+
if (chargingOrder.getAppUserCarId()!=null){
List<TAppUserCar> data3 = appUserCarClient.getCarByIds(Collections.singletonList(chargingOrder.getAppUserCarId())).getData();
- if (!data3.isEmpty())chargingOrderListInfoVO.setLicensePlate(data3.get(0).getLicensePlate());
+ if (data3!=null && !data3.isEmpty())chargingOrderListInfoVO.setLicensePlate(data3.get(0).getLicensePlate());
}
chargingOrderListInfoVO.setStartTime(chargingOrder.getStartTime());
chargingOrderListInfoVO.setEndTime(chargingOrder.getEndTime());
chargingOrderListInfoVO.setId(chargingOrder.getId());
chargingOrderListInfoVO.setUid(chargingOrder.getId().toString());
- chargingOrderListInfoVO.setList(data6);
chargingOrderListInfoVO.setCouponDiscountAmount(chargingOrder.getCouponDiscountAmount());
chargingOrderListInfoVO.setVipDiscountAmount(chargingOrder.getVipDiscountAmount());
chargingOrderListInfoVO.setSharingAmount(chargingOrder.getSharingAmount());
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java
index 1e75523..c6ce31b 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java
@@ -26,6 +26,8 @@
private String terminalName;
@ApiModelProperty(value = "结束原因 （0=异常终止，1=主动终止，2=满电终止，3=费用不足终止）")
private Integer endMode;
+ @ApiModelProperty(value = "状态（-1=启动失败，取消订单，0=未知，1=等待中，2=启动中，3=充电中，4=停止中，5=已结束）")
+ private Integer status;
@ApiModelProperty(value = "开始soc")
private String startSoc;
@ApiModelProperty(value = "结束soc")
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingBillMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingBillMapper.xml
index 9300228..693bc61 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingBillMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingBillMapper.xml
@@ -13,7 +13,7 @@
and t1.status = #{req.state}
</if>
<if test="startTime1 != null and startTime1!=''">
- and (t1.bill_time between #{startTime1} and #{startTime2}
+ and (t1.bill_time between #{startTime1} and #{startTime2})
</if>
<if test="req.uid != null and req.uid!=''">
and t1.id = #{req.uid}
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..a4d0036 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
@@ -465,7 +465,7 @@
and t1.order_type = #{req.orderType}
</if>
<if test="req.status != null ">
- and t1.status = #{status}
+ and t1.status = #{req.status}
</if>
<if test="req.status != null ">
and t1.status = #{req.status}
@@ -480,7 +480,7 @@
and (t1.end_time between #{endTime1} and #{endTime2})
</if>
</select>
- <select id="chargingList1" resultType="com.ruoyi.order.api.vo.ChargingOrderListVO">
+ <select id="chargingListNoPage" resultType="com.ruoyi.order.api.vo.ChargingOrderListVO">
select t1.* from t_charging_order t1
where 1=1
<if test="null != req.code and req.code!=''">
@@ -502,7 +502,7 @@
and t1.order_type = #{req.orderType}
</if>
<if test="req.status != null ">
- and t1.status = #{status}
+ and t1.status = #{req.status}
</if>
<if test="req.status != null ">
and t1.status = #{req.status}
--
Gitblit v1.7.1