From 305be33583f93ac6a993c98909648989dc72c4b4 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sun, 23 Mar 2025 15:15:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:app=E5=95=86=E5=AE=B6=E5=90=8C=E6=84=8F?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hard/controller/order/HardAfterSaleController.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardAfterSaleController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardAfterSaleController.java
index be78ebb5f..4c02981aa 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardAfterSaleController.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardAfterSaleController.java
@@ -13,6 +13,7 @@ import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import com.bsd.pjcloud.hard.api.dto.order.HardAdminRefundDto;
 import com.bsd.pjcloud.hard.api.dto.order.HardAfterSaleDto;
 import com.bsd.pjcloud.hard.api.dto.order.HardDisagreeDto;
+import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
 import com.bsd.pjcloud.hard.api.entity.order.HardAfterSaleEntity;
 import com.bsd.pjcloud.hard.api.entity.order.HardAfterSaleLogEntity;
 import com.bsd.pjcloud.hard.api.vo.order.HardAfterSaleVo;
@@ -75,6 +76,13 @@ public class HardAfterSaleController {
         dto.setOrderId(id);
         return R.ok(hardAfterSaleService.join(dto));
     }
+
+    @Operation(summary = "app商户同意退款", description = "app商户同意退款")
+    @PostMapping("/app/mch-agree")
+    public R appMchRefund(@RequestParam Long id) {
+        PjcloudUser user = SecurityUtils.getUser();
+        return R.ok(hardAfterSaleService.agreeAfterSale(user.getId(), id));
+    }
     /* ************************************* end app end ************************************* */
 
     @PostMapping(value = "/admin-refund")