From 9d4db6ff486cfe102b6f43b4e72a0b535ae87a3f Mon Sep 17 00:00:00 2001
From: DB <2502523450@qq.com>
Date: Tue, 14 Nov 2023 10:12:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/mini/MiniOrderController.java  |  2 +
 .../service/impl/OrderServiceImpl.java        | 10 ++-
 .../cpop/mall/business/vo/OrderPageVo.java    |  6 ++
 .../cpop/mall/business/vo/OrderRefundVo.java  | 62 +++++++++++++++++++
 4 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 Cpop-Mall/src/main/java/com/cpop/mall/business/vo/OrderRefundVo.java

diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/controller/mini/MiniOrderController.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/controller/mini/MiniOrderController.java
index a33566e..dc7f6c5 100644
--- a/Cpop-Mall/src/main/java/com/cpop/mall/business/controller/mini/MiniOrderController.java
+++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/controller/mini/MiniOrderController.java
@@ -6,9 +6,11 @@ import com.cpop.core.utils.SpringUtils;
 import com.cpop.mall.business.bo.*;
 import com.cpop.mall.business.entity.OrderEvaluate;
 import com.cpop.mall.business.service.OrderEvaluateService;
+import com.cpop.mall.business.service.OrderRefundService;
 import com.cpop.mall.business.service.OrderService;
 import com.cpop.mall.business.vo.OrderInfoVo;
 import com.cpop.mall.business.vo.OrderPageVo;
+import com.cpop.mall.business.vo.OrderRefundPageVo;
 import com.mybatisflex.core.paginate.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderServiceImpl.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderServiceImpl.java
index 2781c55..c8ef212 100644
--- a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderServiceImpl.java
+++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderServiceImpl.java
@@ -146,7 +146,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                                 .leftJoin(PRODUCT_RECORD).on(PRODUCT_RECORD.ID.eq(ORDER_DETAIL.PRODUCT_RECORD_ID))
                                 .leftJoin(PRODUCT).on(PRODUCT.ID.eq(PRODUCT_RECORD.PRODUCT_ID))
                                 .leftJoin(STORE).on(STORE.ID.eq(ORDER_DETAIL.STORE_ID))
-                                .where(ORDER_DETAIL.ORDER_ID.eq(pageVo.getId()))));
+                                .where(ORDER_DETAIL.ORDER_ID.eq(pageVo.getId()))),
+                //查询退款状态
+                item -> item.field(OrderPageVo::getOrderRefundVo)
+                        .queryWrapper(refundVo -> queryChain()
+                                .select(ORDER_REFUND.REFUND_STATUS, ORDER_REFUND.REFUND_REASON, ORDER_REFUND.ID, ORDER_REFUND.ORDER_ID, ORDER_REFUND.CREATE_TIME)
+                                .from(ORDER_REFUND)
+                                .where(ORDER_REFUND.ORDER_ID.eq(refundVo.getId()))
+                                .orderBy(ORDER_REFUND.CREATE_TIME.desc())
+                                .limit(1)));
     }
 
     /**
diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/vo/OrderPageVo.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/vo/OrderPageVo.java
index 56d2c71..36ad359 100644
--- a/Cpop-Mall/src/main/java/com/cpop/mall/business/vo/OrderPageVo.java
+++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/vo/OrderPageVo.java
@@ -123,4 +123,10 @@ public class OrderPageVo implements Serializable {
      */
     @ApiModelProperty("订单详情")
     private List<OrderDetailVo> detailList;
+
+    /**
+     * 订单退款相关参数
+     */
+    @ApiModelProperty("订单退款相关参数")
+    private OrderRefundVo orderRefundVo;
 }
diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/vo/OrderRefundVo.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/vo/OrderRefundVo.java
new file mode 100644
index 0000000..65ca8e1
--- /dev/null
+++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/vo/OrderRefundVo.java
@@ -0,0 +1,62 @@
+package com.cpop.mall.business.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author DB
+ * @createTime 2023/11/14 9:37
+ * @description
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "商城订单退款返回对象")
+public class OrderRefundVo implements Serializable {
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    private String id;
+
+    /**
+     * 退款状态
+     */
+    @ApiModelProperty("退款状态")
+    private Integer refundStatus;
+
+    /**
+     * 订单id
+     */
+    @ApiModelProperty("订单id")
+    private String orderId;
+
+    /**
+     * 退款外部id
+     */
+    @ApiModelProperty("退款外部id")
+    private String outRefundId;
+
+    /**
+     * 退款原因
+     */
+    @ApiModelProperty("退款原因")
+    private String refundReason;
+
+    /**
+     * 拒绝原因
+     */
+    @ApiModelProperty("拒绝原因")
+    private String rejectReason;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+}