From 02959bf983a2556bf5eb65b97811d802a7dd3a4f Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 9 Jan 2025 14:04:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/refund/HardAfterSaleWayEnum.java | 20 +++++++++++++++++++
 .../constant/refund/HardSaleStatusEnum.java   | 11 ++++++----
 .../api/constant/refund/HardSaleTypeEnum.java |  3 +++
 .../order/HardAfterSaleController.java        |  4 ++--
 .../impl/order/HardAfterSaleServiceImpl.java  |  2 +-
 5 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/refund/HardAfterSaleWayEnum.java

diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/refund/HardAfterSaleWayEnum.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/refund/HardAfterSaleWayEnum.java
new file mode 100644
index 000000000..65942830b
--- /dev/null
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/refund/HardAfterSaleWayEnum.java
@@ -0,0 +1,20 @@
+package com.bsd.pjcloud.hard.api.constant.refund;
+
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 退货类型
+ */
+@RequiredArgsConstructor
+@Getter
+public enum HardAfterSaleWayEnum {
+
+    REFUND("10", "售中退款"),
+    RETURN_AND_REFUND("20", "售后退款"),
+    ;
+
+    private final String type;
+    private final String name;
+}
diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/refund/HardSaleStatusEnum.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/refund/HardSaleStatusEnum.java
index 834e6c361..14c72b047 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/refund/HardSaleStatusEnum.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/refund/HardSaleStatusEnum.java
@@ -6,25 +6,28 @@ import lombok.Getter;
 import java.util.Collection;
 import java.util.Collections;
 
+/**
+ * 退款详细状态
+ */
 @AllArgsConstructor
 @Getter
 public enum HardSaleStatusEnum {
     /**
      * 【申请售后】
      */
-    APPLY("10", "申请中", "会员申请退款"), // 有赞的状态提示：退款申请待商家处理
+    APPLY("10", "申请中", "申请退款"),
     /**
      * 完成退款【退款成功】
      */
-    COMPLETE("50", "完成", "商家确认退款"), // 有赞的状态提示：退款成功
+    COMPLETE("50", "完成", "商家确认退款"),
     /**
      * 【买家取消】
      */
-    BUYER_CANCEL("61", "买家取消售后", "会员取消退款"), // 有赞的状态提示：退款关闭
+    BUYER_CANCEL("61", "买家取消售后", "会员取消退款"),
     /**
      * 卖家拒绝售后；商家拒绝【商家拒绝】
      */
-    SELLER_DISAGREE("62", "卖家拒绝", "商家拒绝退款"), // 有赞的状态提示：商家不同意退款申请
+    SELLER_DISAGREE("62", "卖家拒绝", "商家拒绝退款"),
     ;
 
     public static final Collection<String> APPLYING_STATUSES = Collections.singletonList(APPLY.getStatus());
diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/refund/HardSaleTypeEnum.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/refund/HardSaleTypeEnum.java
index b0b0bb727..cbe9b6167 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/refund/HardSaleTypeEnum.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/refund/HardSaleTypeEnum.java
@@ -3,6 +3,9 @@ package com.bsd.pjcloud.hard.api.constant.refund;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+/**
+ * 退款类型
+ */
 @AllArgsConstructor
 @Getter
 public enum HardSaleTypeEnum {
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 fa1bafbb8..edc1a7cbd 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
@@ -70,9 +70,9 @@ public class HardAfterSaleController {
 
     @GetMapping(value = "/app/detail-by-order-id")
     @Operation(summary = "app查询退款详情")
-    public R<HardAfterSaleVo> appDetail(@RequestParam Long orderId) {
+    public R<HardAfterSaleVo> appDetail(@RequestParam Long id) {
         HardAfterSaleDto dto = new HardAfterSaleDto();
-        dto.setOrderId(orderId);
+        dto.setOrderId(id);
         return R.ok(hardAfterSaleService.join(dto));
     }
     /* ************************************* end app end ************************************* */
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 4b669314a..f4d511fd1 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
@@ -268,7 +268,7 @@ public class HardAfterSaleServiceImpl extends ServiceImpl<HardAfterSaleMapper, H
 
     @Transactional(rollbackFor = Exception.class)
     public HardAfterSaleEntity createAfterSale(HardOrderVo order, HardAfterSaleDto dto) {
-        HardAfterSaleEntity saveObj = new HardAfterSaleEntity();
+        HardAfterSaleEntity saveObj = BeanUtils.toBean(dto, HardAfterSaleEntity.class);
         // 创建售后单
         String refundCode = "hard_" + order.getId();
         saveObj.setStatus(HardSaleStatusEnum.APPLY.getStatus());