autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 订单详情 new收费明细

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-05-05 16:46:43 +08:00
parent 4ea0f8d562
commit c2e5784caa
3 changed files with 86 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@ import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.common.enums.InvoiceRecordEnum;
import com.jsowell.common.enums.MemberWalletEnum;
import com.jsowell.common.enums.ykc.ActionTypeEnum;
import com.jsowell.common.enums.ykc.BillingTimeEnum;
import com.jsowell.common.enums.ykc.OrderPayModeEnum;
import com.jsowell.common.enums.ykc.OrderPayRecordEnum;
import com.jsowell.common.enums.ykc.OrderStatusEnum;
@@ -796,6 +797,41 @@ public class OrderService {
OrderDetailInfoVO.BillingDetails billingDetails = new OrderDetailInfoVO.BillingDetails();
BeanUtils.copyBeanProp(billingDetails, orderDetail);
vo.setBillingDetails(billingDetails);
// new 收费明细
OrderDetailInfoVO.ChargeDetail sharp = new OrderDetailInfoVO.ChargeDetail();
sharp.setPeriodType(BillingTimeEnum.SHARP.getLabel());
sharp.setElectricityPrice(orderDetail.getSharpElectricityPrice());
sharp.setServicePrice(orderDetail.getSharpServicePrice());
sharp.setUsedElectricity(orderDetail.getSharpUsedElectricity());
sharp.setElectricityAmount(sharp.getElectricityPrice().multiply(sharp.getUsedElectricity()));
sharp.setServiceAmount(sharp.getServicePrice().multiply(sharp.getUsedElectricity()));
OrderDetailInfoVO.ChargeDetail peak = new OrderDetailInfoVO.ChargeDetail();
peak.setPeriodType(BillingTimeEnum.PEAK.getLabel());
peak.setElectricityPrice(orderDetail.getPeakElectricityPrice());
peak.setServicePrice(orderDetail.getPeakServicePrice());
peak.setUsedElectricity(orderDetail.getPeakUsedElectricity());
peak.setElectricityAmount(peak.getElectricityPrice().multiply(peak.getUsedElectricity()));
peak.setServiceAmount(peak.getServicePrice().multiply(peak.getUsedElectricity()));
OrderDetailInfoVO.ChargeDetail flat = new OrderDetailInfoVO.ChargeDetail();
flat.setPeriodType(BillingTimeEnum.PEAK.getLabel());
flat.setElectricityPrice(orderDetail.getFlatElectricityPrice());
flat.setServicePrice(orderDetail.getFlatServicePrice());
flat.setUsedElectricity(orderDetail.getFlatUsedElectricity());
flat.setElectricityAmount(flat.getElectricityPrice().multiply(flat.getUsedElectricity()));
flat.setServiceAmount(flat.getServicePrice().multiply(flat.getUsedElectricity()));
OrderDetailInfoVO.ChargeDetail valley = new OrderDetailInfoVO.ChargeDetail();
valley.setPeriodType(BillingTimeEnum.PEAK.getLabel());
valley.setElectricityPrice(orderDetail.getValleyElectricityPrice());
valley.setServicePrice(orderDetail.getValleyServicePrice());
valley.setUsedElectricity(orderDetail.getValleyUsedElectricity());
valley.setElectricityAmount(valley.getElectricityPrice().multiply(valley.getUsedElectricity()));
valley.setServiceAmount(valley.getServicePrice().multiply(valley.getUsedElectricity()));
vo.setChargeDetails(Lists.newArrayList(sharp, peak, flat, valley));
}
// 用户信息