autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-25 01:29:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-01-24 16:52:18 +08:00
parent 97151653e2
commit 0e8588b87d
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,6 +367,7 @@ public class OrderService {
order.setStopReasonMsg(orderBasicInfo.getReason()); order.setStopReasonMsg(orderBasicInfo.getReason());
order.setStartSOC(orderBasicInfo.getStartSoc()); order.setStartSOC(orderBasicInfo.getStartSoc());
order.setEndSOC(orderBasicInfo.getEndSoc()); order.setEndSOC(orderBasicInfo.getEndSoc());
order.setDiscountAmount(String.valueOf(orderBasicInfo.getDiscountAmount()));
order.setSettleAmount(String.valueOf(orderBasicInfo.getSettleAmount())); order.setSettleAmount(String.valueOf(orderBasicInfo.getSettleAmount()));
order.setSettlementTime(DateUtils.formatDateTime(orderBasicInfo.getSettlementTime())); order.setSettlementTime(DateUtils.formatDateTime(orderBasicInfo.getSettlementTime()));
vo.setOrderInfo(order); vo.setOrderInfo(order);

7
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java
View File

@@ -756,11 +756,14 @@ public abstract class AbstractProgramLogic implements InitializingBean {
// 订单折扣金额 // 订单折扣金额
BigDecimal discountAmount = discountServiceAmount.add(discountElectricityAmount); BigDecimal discountAmount = discountServiceAmount.add(discountElectricityAmount);
orderBasicInfo.setDiscountAmount(discountAmount); orderBasicInfo.setDiscountAmount(discountAmount);
// 更新退款金额 = 退款金额 - 折扣金额
// BigDecimal refundAmount = orderBasicInfo.getRefundAmount().subtract(discountAmount); // 更新结算金额 结算金额 = 消费金额 - 虚拟金额 - 优惠金额
BigDecimal newSettleAmount = orderBasicInfo.getSettleAmount().subtract(discountAmount);
orderBasicInfo.setSettleAmount(newSettleAmount);
// 总消费金额 = 折扣后电费 + 折扣后服务费 // 总消费金额 = 折扣后电费 + 折扣后服务费
BigDecimal totalConsumeAmount = afterServiceAmountDiscount.add(afterElectricityAmountDiscount); BigDecimal totalConsumeAmount = afterServiceAmountDiscount.add(afterElectricityAmountDiscount);
// 更新退款金额 // 更新退款金额
BigDecimal refundAmount = orderBasicInfo.getPayAmount().subtract(totalConsumeAmount).setScale(2, RoundingMode.DOWN); BigDecimal refundAmount = orderBasicInfo.getPayAmount().subtract(totalConsumeAmount).setScale(2, RoundingMode.DOWN);
orderBasicInfo.setRefundAmount(refundAmount); orderBasicInfo.setRefundAmount(refundAmount);

1
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
View File

@@ -67,6 +67,7 @@ public class OrderDetailInfoVO {
private String createTime; // 订单创建时间 private String createTime; // 订单创建时间
private String startSOC; // 开始SOC private String startSOC; // 开始SOC
private String endSOC; // 结束SOC private String endSOC; // 结束SOC
private String discountAmount; // 订单优惠金额
private String settleAmount;// 结算金额 private String settleAmount;// 结算金额
private String settlementTime; // 结算时间 private String settlementTime; // 结算时间
} }

4
jsowell-ui/src/views/order/order/orderDetail.vue
View File

@@ -87,6 +87,10 @@
orderInfo.createTime orderInfo.createTime
}} }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="订单优惠金额">{{
orderInfo.discountAmount
}}
</el-descriptions-item>
<el-descriptions-item label="订单结算金额">{{ <el-descriptions-item label="订单结算金额">{{
orderInfo.settleAmount orderInfo.settleAmount
}} }}