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 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() + "> 重复");