From ca83cffffaf12e17d3935e6ce37e18306c0a5b20 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Sat, 11 Oct 2025 16:07:37 +0800
Subject: [PATCH] =?UTF-8?q?add=20=20=E5=90=8E=E7=AE=A1=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E4=BF=9D=E9=99=A9=E9=87=91=E9=A2=9D=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/service/OrderService.java     |  2 ++
 .../pile/OrderBasicInfoController.java        | 20 +++++++++++++++++++
 .../src/test/java/PaymentTestController.java  |  6 +++---
 .../pile/vo/web/OrderDetailInfoVO.java        |  2 ++
 4 files changed, 27 insertions(+), 3 deletions(-)

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 b60629e51..61bb694ab 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -438,6 +438,8 @@ public class OrderService {
         order.setDiscountAmount(String.valueOf(orderBasicInfo.getDiscountAmount()));
         order.setSettleAmount(String.valueOf(orderBasicInfo.getSettleAmount()));
         order.setSettlementTime(DateUtils.formatDateTime(orderBasicInfo.getSettlementTime()));
+        order.setMerchantId(orderBasicInfo.getMerchantId());
+        order.setInsuranceAmount(String.valueOf(orderBasicInfo.getInsuranceAmount()));
         vo.setOrderInfo(order);
 
         // 设备信息
diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
index ba38b698e..caf599418 100644
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
@@ -344,4 +344,24 @@ public class OrderBasicInfoController extends BaseController {
 		return response;
 	}
 
+	/**
+	 * 订单保险金额退款
+	 * @return
+	 */
+	@PostMapping("/refundInsuranceAmount")
+	public RestApiResponse<?> refundInsuranceAmount(@RequestBody OrderBasicInfo orderBasicInfo) {
+		RestApiResponse<?> response = null;
+		try {
+			orderBasicInfoService.refundInsurance(orderBasicInfo);
+			response = new RestApiResponse<>();
+		} catch (BusinessException e) {
+			logger.error("订单保险金额退款 error,", e);
+			response = new RestApiResponse<>(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			logger.error("订单保险金额退款 error,", e);
+			response = new RestApiResponse<>(e);
+		}
+		logger.info("订单保险金额退款 params:{}, result:{}", JSON.toJSONString(orderBasicInfo), response);
+		return response;
+	}
 }
diff --git a/jsowell-admin/src/test/java/PaymentTestController.java b/jsowell-admin/src/test/java/PaymentTestController.java
index 51da6762d..3155d228b 100644
--- a/jsowell-admin/src/test/java/PaymentTestController.java
+++ b/jsowell-admin/src/test/java/PaymentTestController.java
@@ -484,10 +484,10 @@ public class PaymentTestController {
      */
     @Test
     public void createPaymentReverseRequestTest() {
-        String paymentId = "002212025092509265410817097978174926848";
+        String paymentId = "002212025100513581210820790129447211008";
         BigDecimal refundAmount = new BigDecimal("0.5");
-        String memberId = "65622699";
-        String orderCode = "C23464104497";
+        String memberId = "84488845";
+        String orderCode = "C82180436213";
 
         // 延迟分账未确认调撤销调撤销接口退款
         PaymentReverseOperation operation = new PaymentReverseOperation();
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
index eb54492bd..800904952 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
@@ -68,6 +68,8 @@ public class OrderDetailInfoVO {
 		private String createTime; // 订单创建时间
 		private String startSOC; // 开始SOC
 		private String endSOC; // 结束SOC
+		private String merchantId; // 运营商id
+		private String insuranceAmount; // 保险金额
 		private String orderAmount; // 订单消费金额
 		private String discountAmount; // 订单优惠金额
 		private String settleAmount;// 结算金额