autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-02 13:07:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Lemon
2023-05-08 10:38:02 +08:00
parent e2d7c984c4
commit ff389a69d7
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -816,7 +816,7 @@ public class OrderService {
peak.setServiceAmount(peak.getServicePrice().multiply(peak.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); peak.setServiceAmount(peak.getServicePrice().multiply(peak.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
OrderDetailInfoVO.ChargeDetail flat = new OrderDetailInfoVO.ChargeDetail(); OrderDetailInfoVO.ChargeDetail flat = new OrderDetailInfoVO.ChargeDetail();
flat.setPeriodType(BillingTimeEnum.PEAK.getLabel()); flat.setPeriodType(BillingTimeEnum.FLAT.getLabel());
flat.setElectricityPrice(orderDetail.getFlatElectricityPrice()); flat.setElectricityPrice(orderDetail.getFlatElectricityPrice());
flat.setServicePrice(orderDetail.getFlatServicePrice()); flat.setServicePrice(orderDetail.getFlatServicePrice());
flat.setUsedElectricity(orderDetail.getFlatUsedElectricity()); flat.setUsedElectricity(orderDetail.getFlatUsedElectricity());
@@ -824,7 +824,7 @@ public class OrderService {
flat.setServiceAmount(flat.getServicePrice().multiply(flat.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); flat.setServiceAmount(flat.getServicePrice().multiply(flat.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN));
OrderDetailInfoVO.ChargeDetail valley = new OrderDetailInfoVO.ChargeDetail(); OrderDetailInfoVO.ChargeDetail valley = new OrderDetailInfoVO.ChargeDetail();
valley.setPeriodType(BillingTimeEnum.PEAK.getLabel()); valley.setPeriodType(BillingTimeEnum.VALLEY.getLabel());
valley.setElectricityPrice(orderDetail.getValleyElectricityPrice()); valley.setElectricityPrice(orderDetail.getValleyElectricityPrice());
valley.setServicePrice(orderDetail.getValleyServicePrice()); valley.setServicePrice(orderDetail.getValleyServicePrice());
valley.setUsedElectricity(orderDetail.getValleyUsedElectricity()); valley.setUsedElectricity(orderDetail.getValleyUsedElectricity());

7
jsowell-common/src/main/java/com/jsowell/common/util/LianLianUtils.java Normal file
View File

@@ -0,0 +1,7 @@
package com.jsowell.common.util;/**
* TODO
*
* @author JS-ZZA
* @date 2023/5/6 14:22
*/public class LianLianUtils {
}