From e9c7dfa1cd260932f52d917fce53dd7c884ec896 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 24 Mar 2025 10:11:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=87=8D=E7=BD=AE=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E5=A7=93=E5=90=8D=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hard/controller/order/HardAfterSaleController.java   | 9 +++++++++
 .../impl/recharge/WalletRechargeApplyServiceImpl.java    | 9 ++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

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 4c02981aa..ffead336f 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
@@ -79,10 +79,19 @@ public class HardAfterSaleController {
 
     @Operation(summary = "app商户同意退款", description = "app商户同意退款")
     @PostMapping("/app/mch-agree")
+    @Idempotent(expireTime = 5, info = "正在处理中，请勿重复操作")
     public R appMchRefund(@RequestParam Long id) {
         PjcloudUser user = SecurityUtils.getUser();
         return R.ok(hardAfterSaleService.agreeAfterSale(user.getId(), id));
     }
+
+    @Operation(summary = "app商户拒绝退款", description = "app商户同意退款")
+    @PostMapping("/app/mch-disagree")
+    @Idempotent(expireTime = 5, info = "正在处理中，请勿重复操作")
+    public R appMchDisagreeRefund(@RequestBody HardDisagreeDto dto) {
+        PjcloudUser user = SecurityUtils.getUser();
+        return R.ok(hardAfterSaleService.disagreeRefund(user.getId(), dto));
+    }
     /* ************************************* end app end ************************************* */
 
     @PostMapping(value = "/admin-refund")
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java
index df85ed468..36e3d7589 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java
@@ -276,11 +276,10 @@ public class WalletRechargeApplyServiceImpl extends ServiceImpl<WalletRechargeAp
                     }
                 }
             }
-            long userNameCount = usernameList.stream().filter(i -> ObjectUtil.equals(i, v.getUsername())).count();
-            if (userNameCount > 1) {
-                errors.add("用户名 <" + v.getUsername() + "> 重复");
-
-            }
+            // long userNameCount = usernameList.stream().filter(i -> ObjectUtil.equals(i, v.getUsername())).count();
+            // if (userNameCount > 1) {
+            //     errors.add("用户名 <" + v.getUsername() + "> 重复");
+            // }
             long userPhone = userPoneList.stream().filter(i -> ObjectUtil.equals(i, v.getUserMobile())).count();
             if (userPhone > 1) {
                 errors.add("用手机号 <" + v.getUserMobile() + "> 重复");