From 8f77b9e79578a2e990544c26d7a39cff8436f250 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 9 Jan 2025 13:27:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=95=86=E6=88=B7=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/order/HardAfterSaleServiceImpl.java | 12 ++++++------
 .../wallet/controller/MchManageController.java       |  6 ++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java
index 18a1566b4..4b669314a 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java
@@ -91,7 +91,7 @@ public class HardAfterSaleServiceImpl extends ServiceImpl<HardAfterSaleMapper, H
     @Override
     public Long create(HardAfterSaleDto dto) {
         HardOrderVo order = validateOrderCanRefund(dto.getOrderId());
-        HardAfterSaleEntity afterSale = createAfterSale(order, dto);
+        HardAfterSaleEntity afterSale = getSelf().createAfterSale(order, dto);
         return afterSale.getId();
     }
 
@@ -106,16 +106,16 @@ public class HardAfterSaleServiceImpl extends ServiceImpl<HardAfterSaleMapper, H
             throw new RuntimeException("取消售后单失败，售后单状态不是【待审核】");
         }
         // 更新售后单的状态为【已取消】
-        HardAfterSaleEntity updateRefundObj =  HardAfterSaleEntity.builder().id(afterSale.getId()).status(HardSaleStatusEnum.BUYER_CANCEL.getStatus()).build();
+        HardAfterSaleEntity updateRefundObj = HardAfterSaleEntity.builder().id(afterSale.getId()).status(HardSaleStatusEnum.BUYER_CANCEL.getStatus()).build();
         baseMapper.updateById(updateRefundObj);
         // 更改订单状态为已取消
         HardAfterSaleLogEntity last = hardAfterSaleLogMapper.getFirst(afterSale.getId());
         if (ObjectUtil.isNotEmpty(last) && ObjectUtil.isNotEmpty(last.getAfterStatus())) {
-            HardOrderEntity updateOrderObj =  HardOrderEntity.builder().id(order.getId()).applyCancelTime(LocalDateTime.now()).orderStatus(last.getBeforeStatus()).build();
+            HardOrderEntity updateOrderObj = HardOrderEntity.builder().id(order.getId()).applyCancelTime(LocalDateTime.now()).orderStatus(last.getBeforeStatus()).build();
             hardOrderService.updateById(updateOrderObj);
         }
         // 添加售后进度
-        HardAfterSaleLogEntity saveLogObj =  HardAfterSaleLogEntity.builder()
+        HardAfterSaleLogEntity saveLogObj = HardAfterSaleLogEntity.builder()
                 .afterSaleId(afterSaleId)
                 .userId(userId)
                 .operateType(HardAfterSaleOperateTypeEnum.MEMBER_CANCEL.getType())
@@ -243,11 +243,11 @@ public class HardAfterSaleServiceImpl extends ServiceImpl<HardAfterSaleMapper, H
     // 校验订单是否可以退款
     private HardOrderVo validateOrderCanRefund(Long orderId) {
         HardOrderEntity order = hardOrderService.getById(orderId);
-        if (ObjectUtil.isEmpty(order)) throw new RuntimeException("示例订单不存在");
+        if (ObjectUtil.isEmpty(order)) throw new RuntimeException("订单不存在");
         HardOrderVo orderVo = BeanUtils.toBean(order, HardOrderVo.class);
         // 检查是否可以退款
         HardOrderTypeEnum orderTypeEnum = HardOrderTypeEnum.valueOfByType(order.getOrderType());
-        if (HardOrderTypeEnum.isRefund(orderTypeEnum)) {
+        if (!HardOrderTypeEnum.isRefund(orderTypeEnum)) {
             throw new RuntimeException("该订单类型不支持退款");
         }
         // 校验订单是否已退款
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java
index b6ee48929..ba377dfe2 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java
@@ -113,6 +113,12 @@ public class MchManageController {
         return R.ok(mchManageService.pageJoin(page, dto));
     }
 
+    @Operation(summary = "分页不要权限下拉", description = "分页不要权限下拉")
+    @GetMapping("/page-join-select")
+    public R pageJoinSelect(@ParameterObject Page page, @ParameterObject MchManageDto dto) {
+        return R.ok(mchManageService.pageJoin(page, dto));
+    }
+
     @Operation(summary = "通过id查询", description = "通过id查询")
     @GetMapping("/{id}")
     @PreAuthorize("@pms.hasPermission('wallet_mchManage_view')")