From 9642685a6b563756a1d0e7f65de9a03d6e662e8d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 28 十月 2024 11:11:08 +0800
Subject: [PATCH] merge
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 769 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 396 insertions(+), 373 deletions(-)
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 ebf2ba9..22f1e35 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
@@ -13,6 +13,7 @@
import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.order.api.model.TChargingOrder;
+import com.ruoyi.order.api.model.TChargingOrderRefund;
import com.ruoyi.order.api.vo.ChargingBillListVO;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -23,12 +24,15 @@
import com.ruoyi.order.mapper.TChargingBillMapper;
import com.ruoyi.order.mapper.TChargingOrderMapper;
import com.ruoyi.order.service.TChargingBillService;
+import com.ruoyi.order.service.TChargingOrderRefundService;
+import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
import org.omg.CORBA.PRIVATE_MEMBER;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -61,8 +65,17 @@
private AppUserClient appUserClient;
@Resource
private AppUserCarClient appUserCarClient;
+ @Resource
+ private TChargingOrderRefundService chargingOrderRefundService;
@Override
public ChargingBillVO chargingBillList1(ChargingListQuery dto) {
+ if (dto.getState()!=null){
+ if (dto.getState()==1){
+ dto.setState(2);
+ }else {
+ dto.setState(1);
+ }
+ }
ChargingBillVO chargingBillVO = new ChargingBillVO();
String startTime1 = null;
String startTime2 = null;
@@ -76,358 +89,6 @@
List<ChargingBillListVO> list = this.baseMapper.chargingBillList1(pageInfo,dto,startTime1,startTime2);
List<ChargingBillListVO> list1 = this.baseMapper.chargingBillList1(pageInfo1,dto,startTime1,startTime2);
chargingBillVO.setOrderCount(list1.size());
- BigDecimal paymentAmountTotal = new BigDecimal("0");
- BigDecimal orderAmountTotal = new BigDecimal("0");
- BigDecimal electrovalenceTotal = new BigDecimal("0");
- BigDecimal serviceChargeTotal = new BigDecimal("0");
- BigDecimal commissionAmountTotal = new BigDecimal("0");
- 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 = "";
- String temp1 = "";
- switch (chargingBillListVO.getType()){
- case 1:
- temp = "全站账单";
- temp1 = "全站";
- break;
- case 2:
- temp = "各个站点账单";
- temp1 = siteClient.getSiteByIds(Arrays.asList(chargingBillListVO.getSiteId())).getData().get(0).getName();
- break;
- }
- chargingBillVO.setCategory(temp);
- chargingBillVO.setSiteName(temp1);
-
- chargingBillVO.setType("月账单");
- chargingBillVO.setCode(chargingBillListVO.getCode());
-
- LocalDateTime billTime = chargingBillListVO.getBillTime();
- // 将其转化为yyyy-MM格式字符串
- chargingBillVO.setCreateTime(billTime.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- // 将billTime减去一个月 转化为yyyy-MM格式字符串
- chargingBillVO.setBillWeek(billTime.minusMonths(1).format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM")));
-
- chargingBillListVO.setUid(chargingBillListVO.getId().toString());
- // 根据账单的出账时间 查询上个月的充电订单
-// LocalDateTime localDate = chargingBillListVO.getBillTime().minusMonths(1);
- // todo 临时修改为查询昨天的充电订单
- LocalDateTime localDate = chargingBillListVO.getBillTime().minusDays(1);
- // 账单周期
- chargingBillListVO.setBillWeek(localDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM")));
- // 获取 LocalDate 对象
- LocalDate date = localDate.toLocalDate();
-// // 获取该月份的第一天
-// LocalDate firstDayOfMonth = date.withDayOfMonth(1);
-// // 获取该月份的最后一天
-// LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
- // todo 临时修改为查询昨天凌晨00:00:00 到 23：59：59
- LocalDateTime firstDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
- LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
- QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
- .between("create_time", firstDayOfMonth, lastDayOfMonth)
- .eq("status", 5)
- .eq("recharge_payment_status", 2);
- if (chargingBillListVO.getType() == 2) {
- eq.eq("site_id", chargingBillListVO.getSiteId());
- }
- List<TChargingOrder> tChargingOrders = chargingOrderList.selectList(eq);
- int chargingSecond = 0;
- BigDecimal paymentAmount = new BigDecimal("0");
- BigDecimal orderAmount = new BigDecimal("0");
- BigDecimal electrovalence = new BigDecimal("0");
- BigDecimal serviceCharge = new BigDecimal("0");
- BigDecimal commissionAmount = new BigDecimal("0");
- BigDecimal sharingAmount = new BigDecimal("0");
- BigDecimal chargingCapacity = new BigDecimal("0");
- orderCount+=tChargingOrders.size();
- chargingBillVO.setCategory("");
- chargingBillVO.setExportList(tChargingOrders);
- for (TChargingOrder tChargingOrder : tChargingOrders) {
- List<Site> data = siteClient.getSiteByIds(Arrays.asList(tChargingOrder.getSiteId())).getData();
- if (!data.isEmpty()){
- chargingBillVO.setSiteName(data.get(0).getName());
- }
- TChargingPile data1 = chargingPileClient.getChargingPileById(tChargingOrder.getChargingPileId()).getData();
- TChargingGun data2 = chargingGunClient.getChargingGunById(tChargingOrder.getChargingGunId()).getData();
- if (data1!=null && data2!=null){
- tChargingOrder.setTerminalName(data1.getName()+data2.getName());
- tChargingOrder.setTerminalCode(data2.getCode());
- }
- tChargingOrder.setOrderClassification1("线上订单");
- tChargingOrder.setRechargePaymentType1("预付");
- tChargingOrder.setChargingType("充电桩接口充电服务");
- switch (tChargingOrder.getStatus()){
- case 1:
- tChargingOrder.setStatus1("等待中");
- break;
- case 2:
- tChargingOrder.setStatus1("启动中");
- break;
- case 3:
- tChargingOrder.setStatus1("充电中");
- break;
- case 4:
- tChargingOrder.setStatus1("停止中");
- break;
- case 5:
- tChargingOrder.setStatus1("已结束");
- break;
- case 0:
- tChargingOrder.setStatus1("未知");
- break;
- }
- if (tChargingOrder.getEndMode()!=null){
- switch (tChargingOrder.getEndMode()){
- case 1:
- tChargingOrder.setEndMode1("主动终止");
- break;
- case 2:
- tChargingOrder.setEndMode1("满电终止");
- break;
- case 3:
- tChargingOrder.setEndMode1("费用不足终止");
- break;
- case 0:
- tChargingOrder.setEndMode1("异常终止");
- break;
- }
- }
- BigDecimal add = tChargingOrder.getElectrovalence().add(tChargingOrder.getServiceCharge());
- tChargingOrder.setTotalAmount(add.toString());
- tChargingOrder.setDiscount(tChargingOrder.getCouponDiscountAmount().toString());
- UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(tChargingOrder.getCode()).getData();
- if (data5!=null){
- if (data5.getTime_remaining()!=null){
- chargingSecond+=data5.getTime_remaining()*60;
- }
- }
- Integer cumulativeChargingTime = data5.getCumulative_charging_time();
- // 将其转化为xx小时xx分钟xx秒显示 如果是0小时则不展示小时 如果是0分钟则不展示分钟
- if (cumulativeChargingTime!=null){
- // 计算小时、分钟和秒
- int hours = cumulativeChargingTime / 60;
- int minutes = cumulativeChargingTime % 60;
- int seconds = 0; // 如果没有秒数，则默认是0
- StringBuilder result = new StringBuilder();
- if (hours > 0) {
- result.append(hours).append("小时");
- }
- if (minutes > 0) {
- result.append(minutes).append("分钟");
- }
- if (seconds > 0 || result.length() == 0) { // 如果秒数大于0，或者小时和分钟都为0，则显示秒数
- result.append(seconds).append("秒");
- }
- tChargingOrder.setChargingTime(result.toString());
- }
- tChargingOrder.setEndSoc(data5.getSoc().toString());
- TAppUser data3 = appUserClient.getUserById(tChargingOrder.getAppUserId()).getData();
- if (tChargingOrder.getAppUserCarId()!=null){
- List<TAppUserCar> data4 = appUserCarClient.getCarByIds(Arrays.asList(tChargingOrder.getAppUserCarId())).getData();
- if (!data4.isEmpty()){
- tChargingOrder.setLicensePlate(data4.get(0).getLicensePlate());
- tChargingOrder.setVehicleModel(data4.get(0).getVehicleModel());
- }
- }
- if (data3!=null)tChargingOrder.setUserName(data3.getName());
- // 累加实收金额 支付金额减去退款金额
- if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getPaymentAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount()).subtract(tChargingOrder.getRefundAmount());
-
- }else if (tChargingOrder.getPaymentAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
- }
- // 累加订单金额
- if (tChargingOrder.getOrderAmount()!=null){
- orderAmount = orderAmount.add(tChargingOrder.getOrderAmount());
- }
- // 累加累计电费
- if (tChargingOrder.getElectrovalence()!=null){
- electrovalence = electrovalence.add(tChargingOrder.getElectrovalence());
- }
- if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getRefundStatus() == 2){
- refundAmount = refundAmount.add(tChargingOrder.getRefundAmount());
- }
- // 累加累计服务费
- if (tChargingOrder.getServiceCharge()!=null){
- serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
- }
- // 累加平台手续费
- if (tChargingOrder.getCommissionAmount()!=null){
- commissionAmount = commissionAmount.add(tChargingOrder.getCommissionAmount());
- }
- // 累加平台分佣
- if (tChargingOrder.getSharingAmount()!=null){
- sharingAmount = sharingAmount.add(tChargingOrder.getSharingAmount());
- }
- // 累加充电度数
- if (tChargingOrder.getChargingCapacity()!=null){
- chargingCapacity = chargingCapacity.add(tChargingOrder.getChargingCapacity());
- }
-
- }
- // 将chargingSecond 这是以秒为单位存放的总秒数 将其转化为xx小时xx分钟xx秒
- int hours = chargingSecond / 3600;
- int minutes = (chargingSecond % 3600) / 60;
- int seconds = chargingSecond % 60;
- // 格式化为字符串
- String timeString = String.format("%d小时%d分钟%d秒", hours, minutes, seconds);
- chargingBillVO.setChargingTime(timeString);
- if (chargingBillVO.getPaymentAmount() == null){
- chargingBillVO.setPaymentAmount(BigDecimal.ZERO);
- }
-
- chargingBillVO.setOrderAmount(chargingBillVO.getPaymentAmount().subtract(chargingBillVO.getRefundAmount()==null?BigDecimal.ZERO:chargingBillVO.getRefundAmount())
- .subtract(chargingBillVO.getCommissionAmount()==null?BigDecimal.ZERO:chargingBillVO.getCommissionAmount())
- .subtract(chargingBillVO.getSharingAmount()==null?BigDecimal.ZERO:chargingBillVO.getSharingAmount()));
- chargingBillListVO.setPaymentAmount(paymentAmount == null?BigDecimal.ZERO:paymentAmount);
- chargingBillListVO.setOrderAmount(orderAmount == null?BigDecimal.ZERO:orderAmount);
- chargingBillListVO.setElectrovalence(electrovalence == null?BigDecimal.ZERO:electrovalence);
- chargingBillListVO.setServiceCharge(serviceCharge == null?BigDecimal.ZERO:serviceCharge);
- chargingBillListVO.setCommissionAmount(commissionAmount == null?BigDecimal.ZERO:commissionAmount);
- chargingBillListVO.setSharingAmount(sharingAmount == null?BigDecimal.ZERO:sharingAmount);
- chargingBillListVO.setChargingCapacity(chargingCapacity == null?BigDecimal.ZERO:chargingCapacity);
- chargingBillListVO.setBillMoney(chargingBillListVO.getPaymentAmount().subtract(chargingBillListVO.getRefundAmount()==null?BigDecimal.ZERO:chargingBillListVO.getRefundAmount())
- .subtract(chargingBillListVO.getCommissionAmount()==null?BigDecimal.ZERO:chargingBillListVO.getCommissionAmount())
- .subtract(chargingBillListVO.getSharingAmount()==null?BigDecimal.ZERO:chargingBillListVO.getSharingAmount()));
- switch (chargingBillListVO.getType()){
- case 1:
- chargingBillListVO.setSiteName("全站");
- break;
- case 2:
- Site site = siteClient.getSiteByIds(Arrays.asList(chargingBillListVO.getSiteId())).getData().get(0);
- if (site!=null){
- chargingBillListVO.setSiteName(site.getName());
- }
- break;
- }
- // 订单数
- chargingBillListVO.setOrderCount(tChargingOrders.size());
- // 充电时间秒
- chargingBillListVO.setChargingSecond(chargingSecond);
- }
- for (ChargingBillListVO chargingBillListVO : list1) {
-
-
-
- LocalDateTime billTime = chargingBillListVO.getBillTime();
- // 将其转化为yyyy-MM格式字符串
- chargingBillVO.setCreateTime(billTime.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- // 将billTime减去一个月 转化为yyyy-MM格式字符串
- chargingBillVO.setBillWeek(billTime.minusMonths(1).format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM")));
-
- chargingBillListVO.setUid(chargingBillListVO.getId().toString());
- // 根据账单的出账时间 查询上个月的充电订单
- LocalDateTime localDate = chargingBillListVO.getBillTime().minusMonths(1);
- // 账单周期
- chargingBillListVO.setBillWeek(localDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM")));
- // 获取 LocalDate 对象
- LocalDate date = localDate.toLocalDate();
-// // 获取该月份的第一天
-// LocalDate firstDayOfMonth = date.withDayOfMonth(1);
-// // 获取该月份的最后一天
-// LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
- // todo 临时修改为查询昨天凌晨00:00:00 到 23：59：59
- LocalDateTime firstDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
- LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
- QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
- .between("create_time", firstDayOfMonth, lastDayOfMonth)
- .eq("status", 5)
- .eq("recharge_payment_status", 2);
- if (chargingBillListVO.getType() == 2) {
- eq.eq("site_id", chargingBillListVO.getSiteId());
- }
- List<TChargingOrder> tChargingOrders = chargingOrderList.selectList(eq);
- int chargingSecond = 0;
- BigDecimal paymentAmount = new BigDecimal("0");
- BigDecimal orderAmount = new BigDecimal("0");
- BigDecimal electrovalence = new BigDecimal("0");
- BigDecimal serviceCharge = new BigDecimal("0");
- BigDecimal commissionAmount = new BigDecimal("0");
- BigDecimal sharingAmount = new BigDecimal("0");
- BigDecimal chargingCapacity = new BigDecimal("0");
- orderCount+=tChargingOrders.size();
- chargingBillVO.setCategory("");
- chargingBillVO.setExportList(tChargingOrders);
- for (TChargingOrder tChargingOrder : tChargingOrders) {
-
- // 累加实收金额 支付金额减去退款金额
- if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getPaymentAmount()!=null){
- paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount()).subtract(tChargingOrder.getRefundAmount());
-
- }else if (tChargingOrder.getPaymentAmount()!=null){
- paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
- }
- // 累加订单金额
- if (tChargingOrder.getOrderAmount()!=null){
- orderAmountTotal = orderAmountTotal.add(tChargingOrder.getOrderAmount());
- }
- // 累加累计电费
- if (tChargingOrder.getElectrovalence()!=null){
- electrovalenceTotal = electrovalenceTotal.add(tChargingOrder.getElectrovalence());
- }
- if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getRefundStatus() == 2){
- refundAmount = refundAmount.add(tChargingOrder.getRefundAmount());
- }
- // 累加累计服务费
- if (tChargingOrder.getServiceCharge()!=null){
- serviceChargeTotal = serviceChargeTotal.add(tChargingOrder.getServiceCharge());
- }
- // 累加平台手续费
- if (tChargingOrder.getServiceCharge()!=null){
- commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.006")));
- }
- // 累加平台分佣
- if (tChargingOrder.getSharingAmount()!=null){
- sharingAmountTotal = sharingAmountTotal.add(tChargingOrder.getSharingAmount());
- }
- // 累加充电度数
- if (tChargingOrder.getElectricity()!=null){
-
- chargingCapacityTotal = chargingCapacityTotal.add(tChargingOrder.getElectricity());
- }
- // 累加优惠金额
- if (tChargingOrder.getCouponDiscountAmount()!=null){
- discountTotal = discountTotal.add(tChargingOrder.getCouponDiscountAmount());
- }
- if (tChargingOrder.getVipDiscountAmount()!=null){
- discountTotal = discountTotal.add(tChargingOrder.getVipDiscountAmount());
- }
- }
- }
- chargingBillVO.setChargingCapacity(chargingCapacityTotal);
- chargingBillVO.setPaymentAmount(paymentAmountTotal);
- chargingBillVO.setOrderAmount(orderAmountTotal);
- chargingBillVO.setElectrovalence(electrovalenceTotal);
- chargingBillVO.setServiceCharge(serviceChargeTotal);
- chargingBillVO.setOrderCount(orderCount);
- chargingBillVO.setCommissionAmount(commissionAmountTotal);
- chargingBillVO.setSharingAmount(sharingAmountTotal);
- chargingBillVO.setDiscount(discountTotal);
-
-
- pageInfo.setRecords(list);
- chargingBillVO.setList(pageInfo);
- return chargingBillVO;
- }
- @Override
- public ChargingBillVO chargingBillList(ChargingListQuery dto) {
- ChargingBillVO chargingBillVO = new ChargingBillVO();
- String startTime1 = null;
- String startTime2 = null;
- if (StringUtils.hasLength(dto.getStartTime())){
- String[] split = dto.getStartTime().split(" - ");
- startTime1 = split[0];
- startTime2 = split[1];
- }
- PageInfo<ChargingBillListVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
- PageInfo<ChargingBillListVO> pageInfo1 = new PageInfo<>(1,9999999);
- List<ChargingBillListVO> list = this.baseMapper.chargingBillList(pageInfo,dto,startTime1,startTime2);
- List<ChargingBillListVO> list1 = this.baseMapper.chargingBillList(pageInfo1,dto,startTime1,startTime2);
BigDecimal paymentAmountTotal = new BigDecimal("0");
BigDecimal orderAmountTotal = new BigDecimal("0");
BigDecimal electrovalenceTotal = new BigDecimal("0");
@@ -527,6 +188,365 @@
break;
case 5:
tChargingOrder.setStatus1("已结束");
+ break;
+ case 0:
+ tChargingOrder.setStatus1("未知");
+ break;
+ }
+ if (tChargingOrder.getEndMode()!=null){
+ switch (tChargingOrder.getEndMode()){
+ case 1:
+ tChargingOrder.setEndMode1("主动终止");
+ break;
+ case 2:
+ tChargingOrder.setEndMode1("满电终止");
+ break;
+ case 3:
+ tChargingOrder.setEndMode1("费用不足终止");
+ break;
+ case 0:
+ tChargingOrder.setEndMode1("异常终止");
+ break;
+ }
+ }
+ BigDecimal add = tChargingOrder.getElectrovalence().add(tChargingOrder.getServiceCharge());
+ tChargingOrder.setTotalAmount(add.toString());
+ tChargingOrder.setDiscount(tChargingOrder.getCouponDiscountAmount()!=null?tChargingOrder.getCouponDiscountAmount().toString():"0");
+ UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(tChargingOrder.getCode()).getData();
+ if (data5!=null){
+ if (data5.getTime_remaining()!=null){
+ chargingSecond+=data5.getTime_remaining()*60;
+ }
+ Integer cumulativeChargingTime = data5.getCumulative_charging_time();
+ // 将其转化为xx小时xx分钟xx秒显示 如果是0小时则不展示小时 如果是0分钟则不展示分钟
+ if (cumulativeChargingTime!=null){
+ // 计算小时、分钟和秒
+ int hours = cumulativeChargingTime / 60;
+ int minutes = cumulativeChargingTime % 60;
+ int seconds = 0; // 如果没有秒数，则默认是0
+ StringBuilder result = new StringBuilder();
+ if (hours > 0) {
+ result.append(hours).append("小时");
+ }
+ if (minutes > 0) {
+ result.append(minutes).append("分钟");
+ }
+ if (seconds > 0 || result.length() == 0) { // 如果秒数大于0，或者小时和分钟都为0，则显示秒数
+ result.append(seconds).append("秒");
+ }
+ tChargingOrder.setChargingTime(result.toString());
+ }
+ tChargingOrder.setEndSoc(data5.getSoc().toString());
+ }
+
+ TAppUser data3 = appUserClient.getUserById(tChargingOrder.getAppUserId()).getData();
+ if (tChargingOrder.getAppUserCarId()!=null){
+ List<TAppUserCar> data4 = appUserCarClient.getCarByIds(Arrays.asList(tChargingOrder.getAppUserCarId())).getData();
+ if (!data4.isEmpty()){
+ tChargingOrder.setLicensePlate(data4.get(0).getLicensePlate());
+ tChargingOrder.setVehicleModel(data4.get(0).getVehicleModel());
+ }
+ }
+ if (data3!=null)tChargingOrder.setUserName(data3.getName());
+ // 累加实收金额
+ if (tChargingOrder.getOrderAmount()!=null){
+ paymentAmount = paymentAmount.add(tChargingOrder.getOrderAmount());
+ }
+ // 累加订单金额
+ if (tChargingOrder.getOrderAmount()!=null){
+ orderAmount = orderAmount.add(tChargingOrder.getOrderAmount());
+ }
+ // 累加累计电费
+ if (tChargingOrder.getElectrovalence()!=null){
+ electrovalence = electrovalence.add(tChargingOrder.getElectrovalence());
+ }
+ List<TChargingOrderRefund> list2 = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getRefundStatus, 2)
+ .eq(TChargingOrderRefund::getChargingOrderId, tChargingOrder.getId()).list();
+ for (TChargingOrderRefund tChargingOrderRefund : list2) {
+ refundAmount = refundAmount.add(tChargingOrderRefund.getRefundAmount());
+ }
+ // 累加累计服务费
+ if (tChargingOrder.getServiceCharge()!=null){
+ serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
+ }
+ // 累加平台手续费
+ if (tChargingOrder.getOrderAmount()!=null){
+ commissionAmount = commissionAmount.add(tChargingOrder.getOrderAmount().multiply(BigDecimal.valueOf(0.006)));
+ }
+ // 累加平台分佣
+ if (tChargingOrder.getSharingAmount()!=null){
+ sharingAmount = sharingAmount.add(tChargingOrder.getSharingAmount());
+ }
+ // 累加充电度数
+ if (tChargingOrder.getChargingCapacity()!=null){
+ chargingCapacity = chargingCapacity.add(tChargingOrder.getChargingCapacity());
+ }
+
+ }
+ // 将chargingSecond 这是以秒为单位存放的总秒数 将其转化为xx小时xx分钟xx秒
+ int hours = chargingSecond / 3600;
+ int minutes = (chargingSecond % 3600) / 60;
+ int seconds = chargingSecond % 60;
+ // 格式化为字符串
+ String timeString = String.format("%d小时%d分钟%d秒", hours, minutes, seconds);
+ chargingBillVO.setChargingTime(timeString);
+ if (chargingBillVO.getPaymentAmount() == null){
+ chargingBillVO.setPaymentAmount(BigDecimal.ZERO);
+ }
+
+ chargingBillVO.setOrderAmount(chargingBillVO.getPaymentAmount().subtract(chargingBillVO.getRefundAmount()==null?BigDecimal.ZERO:chargingBillVO.getRefundAmount())
+ .subtract(chargingBillVO.getCommissionAmount()==null?BigDecimal.ZERO:chargingBillVO.getCommissionAmount())
+ .subtract(chargingBillVO.getSharingAmount()==null?BigDecimal.ZERO:chargingBillVO.getSharingAmount()));
+ chargingBillListVO.setPaymentAmount(paymentAmount == null?BigDecimal.ZERO:paymentAmount);
+ chargingBillListVO.setOrderAmount(orderAmount == null?BigDecimal.ZERO:orderAmount);
+ chargingBillListVO.setRefundAmount(refundAmount == null?BigDecimal.ZERO:orderAmount);
+ chargingBillListVO.setElectrovalence(electrovalence == null?BigDecimal.ZERO:electrovalence);
+ chargingBillListVO.setServiceCharge(serviceCharge == null?BigDecimal.ZERO:serviceCharge);
+ chargingBillListVO.setCommissionAmount(commissionAmount == null?BigDecimal.ZERO:commissionAmount.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillListVO.setSharingAmount(sharingAmount == null?BigDecimal.ZERO:sharingAmount);
+ chargingBillListVO.setChargingCapacity(chargingCapacity == null?BigDecimal.ZERO:chargingCapacity);
+ chargingBillListVO.setBillMoney(chargingBillListVO.getPaymentAmount().subtract(chargingBillListVO.getRefundAmount()==null?BigDecimal.ZERO:chargingBillListVO.getRefundAmount())
+ .subtract(chargingBillListVO.getCommissionAmount()==null?BigDecimal.ZERO:chargingBillListVO.getCommissionAmount())
+ .subtract(chargingBillListVO.getSharingAmount()==null?BigDecimal.ZERO:chargingBillListVO.getSharingAmount()));
+ switch (chargingBillListVO.getType()){
+ case 1:
+ chargingBillListVO.setSiteName("全站");
+ break;
+ case 2:
+ Site site = siteClient.getSiteByIds(Arrays.asList(chargingBillListVO.getSiteId())).getData().get(0);
+ if (site!=null){
+ chargingBillListVO.setSiteName(site.getName());
+ }
+ break;
+ }
+ // 订单数
+ chargingBillListVO.setOrderCount(tChargingOrders.size());
+ // 充电时间秒
+ chargingBillListVO.setChargingSecond(chargingSecond);
+ }
+ for (ChargingBillListVO chargingBillListVO : list1) {
+ LocalDateTime billTime = chargingBillListVO.getBillTime();
+ // 将其转化为yyyy-MM格式字符串
+ chargingBillVO.setCreateTime(billTime.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ // 将billTime减去一个月 转化为yyyy-MM格式字符串
+ chargingBillVO.setBillWeek(billTime.minusMonths(1).format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM")));
+
+ chargingBillListVO.setUid(chargingBillListVO.getId().toString());
+// LocalDateTime localDate = chargingBillListVO.getBillTime().minusMonths(1);
+ // todo 临时修改为查询昨天的充电订单
+ LocalDateTime localDate = chargingBillListVO.getBillTime().minusDays(1);
+ // 账单周期
+ chargingBillListVO.setBillWeek(localDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM")));
+ // 获取 LocalDate 对象
+ LocalDate date = localDate.toLocalDate();
+// // 获取该月份的第一天
+// LocalDate firstDayOfMonth = date.withDayOfMonth(1);
+// // 获取该月份的最后一天
+// LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
+ // todo 临时修改为查询昨天凌晨00:00:00 到 23：59：59
+ LocalDateTime firstDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
+ LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MAX);
+ QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
+ .between("create_time", firstDayOfMonth, lastDayOfMonth)
+ .eq("status", 5)
+ .eq("recharge_payment_status", 2);
+ if (chargingBillListVO.getType() == 2) {
+ eq.eq("site_id", chargingBillListVO.getSiteId());
+ }
+ List<TChargingOrder> tChargingOrders = chargingOrderList.selectList(eq);
+ orderCount+=tChargingOrders.size();
+ chargingBillVO.setCategory("");
+ chargingBillVO.setExportList(tChargingOrders);
+ for (TChargingOrder tChargingOrder : tChargingOrders) {
+ if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getPaymentAmount()!=null){
+ paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
+
+ }else if (tChargingOrder.getPaymentAmount()!=null){
+ paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
+ }
+ // 累加订单金额
+ if (tChargingOrder.getOrderAmount()!=null){
+ orderAmountTotal = orderAmountTotal.add(tChargingOrder.getOrderAmount());
+ }
+ // 累加累计电费
+ if (tChargingOrder.getElectrovalence()!=null){
+ electrovalenceTotal = electrovalenceTotal.add(tChargingOrder.getElectrovalence());
+ }
+ if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getRefundStatus()!=null&& tChargingOrder.getRefundStatus()==2){
+ refundAmount = refundAmount.add(tChargingOrder.getRefundAmount());
+ }
+ // 累加累计服务费
+ if (tChargingOrder.getServiceCharge()!=null){
+ serviceChargeTotal = serviceChargeTotal.add(tChargingOrder.getServiceCharge());
+ }
+ // 累加平台手续费
+ if (tChargingOrder.getOrderAmount()!=null){
+ commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getOrderAmount().multiply(new BigDecimal("0.006")));
+ }
+ // 累加平台分佣
+ if (tChargingOrder.getSharingAmount()!=null){
+ sharingAmountTotal = sharingAmountTotal.add(tChargingOrder.getSharingAmount());
+ }
+ // 累加充电度数
+ if (tChargingOrder.getElectricity()!=null){
+
+ chargingCapacityTotal = chargingCapacityTotal.add(tChargingOrder.getElectricity());
+ }
+ // 累加优惠金额
+ if (tChargingOrder.getCouponDiscountAmount()!=null){
+ discountTotal = discountTotal.add(tChargingOrder.getCouponDiscountAmount());
+ }
+ if (tChargingOrder.getVipDiscountAmount()!=null){
+ discountTotal = discountTotal.add(tChargingOrder.getVipDiscountAmount());
+ }
+ }
+ }
+ chargingBillVO.setChargingCapacity(chargingCapacityTotal);
+ chargingBillVO.setPaymentAmount(paymentAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillVO.setOrderAmount(orderAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillVO.setElectrovalence(electrovalenceTotal.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillVO.setServiceCharge(serviceChargeTotal.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillVO.setOrderCount(orderCount);
+ chargingBillVO.setCommissionAmount(commissionAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillVO.setSharingAmount(sharingAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillVO.setDiscount(discountTotal);
+
+
+ pageInfo.setRecords(list);
+ chargingBillVO.setList(pageInfo);
+ return chargingBillVO;
+ }
+ @Override
+ public ChargingBillVO chargingBillList(ChargingListQuery dto) {
+ if (dto.getState()!=null){
+ if (dto.getState()==1){
+ dto.setState(2);
+ }else {
+ dto.setState(1);
+ }
+ }
+ ChargingBillVO chargingBillVO = new ChargingBillVO();
+ String startTime1 = null;
+ String startTime2 = null;
+ if (StringUtils.hasLength(dto.getStartTime())){
+ String[] split = dto.getStartTime().split(" - ");
+ startTime1 = split[0];
+ startTime2 = split[1];
+ }
+ PageInfo<ChargingBillListVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
+ PageInfo<ChargingBillListVO> pageInfo1 = new PageInfo<>(1,9999999);
+ List<ChargingBillListVO> list = this.baseMapper.chargingBillList(pageInfo,dto,startTime1,startTime2);
+ List<ChargingBillListVO> list1 = this.baseMapper.chargingBillList(pageInfo1,dto,startTime1,startTime2);
+ BigDecimal paymentAmountTotal = new BigDecimal("0");
+ BigDecimal orderAmountTotal = new BigDecimal("0");
+ BigDecimal electrovalenceTotal = new BigDecimal("0");
+ BigDecimal serviceChargeTotal = new BigDecimal("0");
+ BigDecimal commissionAmountTotal = new BigDecimal("0");
+ 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 = "";
+ String temp1 = "";
+ switch (chargingBillListVO.getType()){
+ case 1:
+ temp = "全站账单";
+ temp1 = "全站";
+ break;
+ case 2:
+ temp = "各个站点账单";
+ temp1 = siteClient.getSiteByIds(Arrays.asList(chargingBillListVO.getSiteId())).getData().get(0).getName();
+ break;
+ }
+ chargingBillVO.setCategory(temp);
+ chargingBillVO.setSiteName(temp1);
+
+ chargingBillVO.setType("月账单");
+ chargingBillVO.setCode(chargingBillListVO.getCode());
+
+ LocalDateTime billTime = chargingBillListVO.getBillTime();
+ // 将其转化为yyyy-MM格式字符串
+ chargingBillVO.setCreateTime(billTime.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ // 将billTime减去一个月 转化为yyyy-MM格式字符串
+ chargingBillVO.setBillWeek(billTime.minusMonths(1).format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM")));
+
+ chargingBillListVO.setUid(chargingBillListVO.getId().toString());
+ // 根据账单的出账时间 查询上个月的充电订单
+// LocalDateTime localDate = chargingBillListVO.getBillTime().minusMonths(1);
+ // todo 临时修改为查询昨天的充电订单
+ LocalDateTime localDate = chargingBillListVO.getBillTime().minusDays(1);
+ // 账单周期
+ chargingBillListVO.setBillWeek(localDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM")));
+ // 获取 LocalDate 对象
+ LocalDate date = localDate.toLocalDate();
+// // 获取该月份的第一天
+// LocalDate firstDayOfMonth = date.withDayOfMonth(1);
+// // 获取该月份的最后一天
+// LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
+ // todo 临时修改为查询昨天凌晨00:00:00 到 23：59：59
+ LocalDateTime firstDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
+ LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MAX);
+ QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
+ .between("create_time", firstDayOfMonth, lastDayOfMonth)
+ .eq("status", 5)
+ .eq("recharge_payment_status", 2);
+ if (chargingBillListVO.getType() == 2) {
+ eq.eq("site_id", chargingBillListVO.getSiteId());
+ }
+ List<TChargingOrder> tChargingOrders = chargingOrderList.selectList(eq);
+ int chargingSecond = 0;
+ BigDecimal paymentAmount = new BigDecimal("0");
+ BigDecimal orderAmount = new BigDecimal("0");
+ BigDecimal electrovalence = new BigDecimal("0");
+ BigDecimal serviceCharge = new BigDecimal("0");
+ BigDecimal commissionAmount = new BigDecimal("0");
+ BigDecimal sharingAmount = new BigDecimal("0");
+ BigDecimal chargingCapacity = new BigDecimal("0");
+ chargingBillVO.setCategory("");
+ chargingBillListVO.setOrderCount(tChargingOrders.size());
+ chargingBillVO.setExportList(tChargingOrders);
+
+ for (TChargingOrder tChargingOrder : tChargingOrders) {
+ if (tChargingOrder.getRechargePaymentType()!=null && tChargingOrder.getRechargePaymentType()==1){
+ chargingBillListVO.setPayTypeName("微信商户");
+ }
+ if (tChargingOrder.getRechargePaymentType()!=null && tChargingOrder.getRechargePaymentType()==2){
+ if (StringUtils.hasLength(chargingBillListVO.getPayTypeName())){
+ chargingBillListVO.setPayTypeName("微信商户+支付宝商户");
+ }else{
+ chargingBillListVO.setPayTypeName("支付宝商户");
+ }
+ }
+ List<Site> data = siteClient.getSiteByIds(Arrays.asList(tChargingOrder.getSiteId())).getData();
+ if (!data.isEmpty()){
+ chargingBillVO.setSiteName(data.get(0).getName());
+ }
+ TChargingPile data1 = chargingPileClient.getChargingPileById(tChargingOrder.getChargingPileId()).getData();
+ TChargingGun data2 = chargingGunClient.getChargingGunById(tChargingOrder.getChargingGunId()).getData();
+ if (data1!=null && data2!=null){
+ tChargingOrder.setTerminalName(data1.getName()+data2.getName());
+ tChargingOrder.setTerminalCode(data2.getCode());
+ }
+ tChargingOrder.setOrderClassification1("线上订单");
+ tChargingOrder.setRechargePaymentType1("预付");
+ tChargingOrder.setChargingType("充电桩接口充电服务");
+ switch (tChargingOrder.getStatus()){
+ case 1:
+ tChargingOrder.setStatus1("等待中");
+ break;
+ case 2:
+ tChargingOrder.setStatus1("启动中");
+ break;
+ case 3:
+ tChargingOrder.setStatus1("充电中");
+ break;
+ case 4:
+ tChargingOrder.setStatus1("停止中");
+ break;
+ case 5:
+ tChargingOrder.setStatus1("已结束");
break;
case 0:
tChargingOrder.setStatus1("未知");
@@ -588,7 +608,7 @@
if (data3!=null)tChargingOrder.setUserName(data3.getName());
// 累加实收金额 支付金额减去退款金额
if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getPaymentAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount()).subtract(tChargingOrder.getRefundAmount());
+ paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
}else if (tChargingOrder.getPaymentAmount()!=null){
paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
@@ -609,8 +629,8 @@
serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
}
// 累加平台手续费
- if (tChargingOrder.getCommissionAmount()!=null){
- commissionAmount = commissionAmount.add(tChargingOrder.getCommissionAmount());
+ if (tChargingOrder.getOrderAmount()!=null){
+ commissionAmount = commissionAmount.add(tChargingOrder.getOrderAmount().multiply(BigDecimal.valueOf(0.006)));
}
// 累加平台分佣
if (tChargingOrder.getSharingAmount()!=null){
@@ -632,9 +652,9 @@
chargingBillListVO.setPaymentAmount(paymentAmount);
chargingBillListVO.setOrderAmount(orderAmount);
chargingBillListVO.setElectrovalence(electrovalence);
- chargingBillListVO.setServiceCharge(serviceCharge);
- chargingBillListVO.setCommissionAmount(commissionAmount);
- chargingBillListVO.setSharingAmount(sharingAmount);
+ chargingBillListVO.setServiceCharge(serviceCharge.setScale(2,RoundingMode.HALF_DOWN));
+ chargingBillListVO.setCommissionAmount(commissionAmount.setScale(2,RoundingMode.HALF_DOWN));
+ chargingBillListVO.setSharingAmount(sharingAmount.setScale(2,RoundingMode.HALF_DOWN));
chargingBillListVO.setChargingCapacity(chargingCapacity);
switch (chargingBillListVO.getType()){
case 1:
@@ -653,6 +673,9 @@
chargingBillListVO.setChargingSecond(chargingSecond);
}
for (ChargingBillListVO chargingBillListVO : list1) {
+ if (chargingBillListVO.getType() ==1){
+ continue;
+ }
LocalDateTime billTime = chargingBillListVO.getBillTime();
// 将其转化为yyyy-MM格式字符串
chargingBillVO.setCreateTime(billTime.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -674,7 +697,7 @@
// LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
// todo 临时修改为查询昨天凌晨00:00:00 到 23：59：59
LocalDateTime firstDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
- LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
+ LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MAX);
QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
.between("create_time", firstDayOfMonth, lastDayOfMonth)
.eq("status", 5)
@@ -683,7 +706,7 @@
eq.eq("site_id", chargingBillListVO.getSiteId());
}
List<TChargingOrder> tChargingOrders = chargingOrderList.selectList(eq);
- int chargingSecond = 0;
+ orderCount+=tChargingOrders.size();
BigDecimal paymentAmount = new BigDecimal("0");
BigDecimal orderAmount = new BigDecimal("0");
BigDecimal electrovalence = new BigDecimal("0");
@@ -691,12 +714,12 @@
BigDecimal commissionAmount = new BigDecimal("0");
BigDecimal sharingAmount = new BigDecimal("0");
BigDecimal chargingCapacity = new BigDecimal("0");
- orderCount+=tChargingOrders.size();
+ chargingBillListVO.setOrderCount(tChargingOrders.size());
for (TChargingOrder tChargingOrder : tChargingOrders) {
// 累加实收金额 支付金额减去退款金额
if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getPaymentAmount()!=null){
- paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount()).subtract(tChargingOrder.getRefundAmount());
- paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount()).subtract(tChargingOrder.getRefundAmount());
+ paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
+ paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
}else if (tChargingOrder.getPaymentAmount()!=null){
paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
@@ -721,9 +744,9 @@
serviceChargeTotal = serviceChargeTotal.add(tChargingOrder.getServiceCharge());
}
// 累加平台手续费
- if (tChargingOrder.getCommissionAmount()!=null){
- commissionAmount = commissionAmount.add(tChargingOrder.getCommissionAmount());
- commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getCommissionAmount());
+ if (tChargingOrder.getOrderAmount()!=null){
+ commissionAmount = commissionAmount.add(tChargingOrder.getOrderAmount().multiply(new BigDecimal("0.006")));
+ commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getOrderAmount().multiply(new BigDecimal("0.006")));
}
// 累加平台分佣
if (tChargingOrder.getSharingAmount()!=null){
@@ -745,14 +768,14 @@
}
}
chargingBillVO.setChargingCapacity(chargingCapacityTotal);
- chargingBillVO.setPaymentAmount(paymentAmountTotal);
- chargingBillVO.setOrderAmount(orderAmountTotal);
- chargingBillVO.setElectrovalence(electrovalenceTotal);
- chargingBillVO.setServiceCharge(serviceChargeTotal);
+ chargingBillVO.setPaymentAmount(paymentAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillVO.setOrderAmount(orderAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillVO.setElectrovalence(electrovalenceTotal.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillVO.setServiceCharge(serviceChargeTotal.setScale(2, RoundingMode.HALF_DOWN));
chargingBillVO.setOrderCount(orderCount);
- chargingBillVO.setCommissionAmount(commissionAmountTotal);
- chargingBillVO.setSharingAmount(sharingAmountTotal);
- chargingBillVO.setDiscount(discountTotal);
+ chargingBillVO.setCommissionAmount(commissionAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillVO.setSharingAmount(sharingAmountTotal.setScale(2, RoundingMode.HALF_DOWN));
+ chargingBillVO.setDiscount(discountTotal.setScale(2, RoundingMode.HALF_DOWN));
pageInfo.setRecords(list);
chargingBillVO.setList(pageInfo);
return chargingBillVO;
--
Gitblit v1.7.1