diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
index 038881e7c..ecbf48b8a 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -408,16 +408,29 @@ public class OrderService {
 			orderBasicInfo.setAppointmentTime(DateUtils.parseDate(dto.getAppointmentTime(), DateUtils.YYYY_MM_DD_HH_MM_SS));
 		}
 		// 订单详情
+		BillingTemplateVO billingTemplate = dto.getBillingTemplate();
+		BigDecimal sharpElectricityPrice = billingTemplate.getSharpElectricityPrice() != null ? billingTemplate.getSharpElectricityPrice() : BigDecimal.ZERO;
+		BigDecimal sharpServicePrice = billingTemplate.getSharpServicePrice() != null ? billingTemplate.getSharpServicePrice() : BigDecimal.ZERO;
+		BigDecimal peakElectricityPrice = billingTemplate.getPeakElectricityPrice() != null ? billingTemplate.getPeakElectricityPrice() : BigDecimal.ZERO;
+		BigDecimal peakServicePrice = billingTemplate.getPeakServicePrice() != null ? billingTemplate.getPeakServicePrice() : BigDecimal.ZERO;
+		BigDecimal flatElectricityPrice = billingTemplate.getFlatElectricityPrice() != null ? billingTemplate.getFlatElectricityPrice() : BigDecimal.ZERO;
+		BigDecimal flatServicePrice = billingTemplate.getFlatServicePrice() != null ? billingTemplate.getFlatServicePrice() : BigDecimal.ZERO;
+		BigDecimal valleyElectricityPrice = billingTemplate.getValleyElectricityPrice() != null ? billingTemplate.getValleyElectricityPrice() : BigDecimal.ZERO;
+		BigDecimal valleyServicePrice = billingTemplate.getValleyServicePrice() != null ? billingTemplate.getValleyServicePrice() : BigDecimal.ZERO;
 		OrderDetail orderDetail = OrderDetail.builder()
 				.orderCode(orderCode)
-				.sharpElectricityPrice(dto.getBillingTemplate().getSharpElectricityPrice())
-				.sharpServicePrice(dto.getBillingTemplate().getSharpServicePrice())
-				.peakElectricityPrice(dto.getBillingTemplate().getPeakElectricityPrice())
-				.peakServicePrice(dto.getBillingTemplate().getPeakServicePrice())
-				.flatElectricityPrice(dto.getBillingTemplate().getFlatElectricityPrice())
-				.flatServicePrice(dto.getBillingTemplate().getFlatServicePrice())
-				.valleyElectricityPrice(dto.getBillingTemplate().getValleyElectricityPrice())
-				.valleyServicePrice(dto.getBillingTemplate().getValleyServicePrice())
+				.sharpPrice(sharpElectricityPrice.add(sharpServicePrice))
+				.sharpElectricityPrice(sharpElectricityPrice)
+				.sharpServicePrice(sharpServicePrice)
+				.peakPrice(peakElectricityPrice.add(peakServicePrice))
+				.peakElectricityPrice(peakElectricityPrice)
+				.peakServicePrice(peakServicePrice)
+				.flatPrice(flatElectricityPrice.add(flatServicePrice))
+				.flatElectricityPrice(flatElectricityPrice)
+				.flatServicePrice(flatServicePrice)
+				.valleyPrice(valleyElectricityPrice.add(valleyServicePrice))
+				.valleyElectricityPrice(valleyElectricityPrice)
+				.valleyServicePrice(valleyServicePrice)
 				.build();
 
 		OrderTransactionDTO createOrderTransactionDTO = OrderTransactionDTO.builder()