update

jsowell-admin/src/main/java/com/jsowell/service/OrderService.java

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

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

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

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

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

jsowell-ui/src/views/order/order/orderDetail.vue

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