From 0ff1896a44e40d73a19686c41c40afb35f6eb2d9 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Wed, 30 Oct 2024 13:56:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E8=A3=85after=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/pile/dto/AfterSettleOrderDTO.java | 72 +++++++++++++++++++
 .../DelayMerchantProgramLogic.java            | 15 ++++
 2 files changed, 87 insertions(+)
 create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/dto/AfterSettleOrderDTO.java

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/AfterSettleOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/AfterSettleOrderDTO.java
new file mode 100644
index 000000000..69698ea38
--- /dev/null
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/AfterSettleOrderDTO.java
@@ -0,0 +1,72 @@
+package com.jsowell.pile.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * 结算订单后DTO
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class AfterSettleOrderDTO {
+    /**
+     * 订单编号
+     */
+    private String orderCode;
+
+    /**
+     * 运营商id
+     */
+    private String merchantId;
+
+    /**
+     * 站点id
+     */
+    private String stationId;
+
+    /**
+     * 订单支付金额
+     */
+    private BigDecimal orderPayAmount;
+
+    /**
+     * 订单消费金额
+     */
+    private BigDecimal orderConsumeAmount;
+
+    /**
+     * 订单结算金额
+     */
+    private BigDecimal orderSettleAmount;
+
+    /**
+     * 订单总电费金额
+     */
+    private BigDecimal orderElectricityAmount;
+
+    /**
+     * 订单电费折扣金额
+     */
+    private BigDecimal orderElectricityDiscountAmount;
+
+    /**
+     * 订单总服务费金额
+     */
+    private BigDecimal orderServiceAmount;
+
+    /**
+     * 订单服务费折扣金额
+     */
+    private BigDecimal orderServiceDiscountAmount;
+
+    /**
+     * 订单退款金额
+     */
+    private BigDecimal orderRefundAmount;
+}
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
index 4ce2c80db..6cb38d065 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
@@ -480,6 +480,21 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
         // 订单退款
         refundOrder(orderBasicInfo);
 
+        // 组装after参数
+        AfterSettleOrderDTO afterSettleOrderDTO = AfterSettleOrderDTO.builder()
+                .orderCode(orderBasicInfo.getOrderCode())
+                .merchantId(orderBasicInfo.getMerchantId())
+                .stationId(orderBasicInfo.getStationId())
+                .orderPayAmount(orderBasicInfo.getPayAmount())
+                .orderConsumeAmount(orderBasicInfo.getOrderAmount())
+                .orderSettleAmount(orderBasicInfo.getSettleAmount())
+                .orderElectricityAmount(orderDetail.getTotalElectricityAmount())
+                .orderElectricityDiscountAmount(orderDetail.getDiscountElectricityAmount())
+                .orderServiceAmount(orderDetail.getTotalServiceAmount())
+                .orderServiceDiscountAmount(orderDetail.getDiscountServiceAmount())
+                .orderRefundAmount(orderBasicInfo.getRefundAmount())
+                .build();
+
         // 将卡/vin状态解锁
         if (!StringUtils.equals("0000000000000000", data.getLogicCard())) {
             cardStatusUnlocked(orderBasicInfo.getLogicCard());