From 9c24adf77d31195099527dae82d492e0dffccd82 Mon Sep 17 00:00:00 2001
From: lele0521 <lele190626@gmail.com>
Date: Tue, 16 Jan 2024 16:45:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E9=80=80=E6=AC=BE=E5=94=AE=E5=90=8E=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aftersale/serviceimpl/AfterSaleServiceImpl.java  |  2 +-
 .../modules/order/order/entity/vo/OrderItemVO.java   |  8 ++++++++
 .../modules/order/order/entity/vo/OrderSimpleVO.java | 12 ++++++++++++
 .../lili/modules/order/order/mapper/OrderMapper.java |  2 ++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java
index a1bb7ffec..d1b4b55e0 100644
--- a/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java
@@ -215,7 +215,7 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
                     afterSaleStatusEnum = AfterSaleStatusEnum.WAIT_REFUND;
                 }
             } else {
-                afterSaleStatusEnum = AfterSaleStatusEnum.PASS;
+                afterSaleStatusEnum = AfterSaleStatusEnum.COMPLETE;
             }
         } else {
             afterSaleStatusEnum = AfterSaleStatusEnum.REFUSE;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java
index 5ab18dcf7..66134c9f7 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java
@@ -56,6 +56,14 @@ public class OrderItemVO {
     @ApiModelProperty(value = "评论状态:未评论(UNFINISHED),待追评(WAIT_CHASE),评论完成(FINISHED)，")
     private String commentStatus;
 
+    /**
+     * @see cn.lili.modules.order.order.entity.enums.RefundStatusEnum
+     */
+    @ApiModelProperty(value = "退款状态")
+    private String isRefund;
+
+    @ApiModelProperty(value = "退款金额")
+    private String refundPrice;
 
     public void setSn(String sn) {
         this.sn = sn;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java
index 23a66b096..b378d8568 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java
@@ -142,6 +142,12 @@ public class OrderSimpleVO {
     @ApiModelProperty(value = "订单促销类型")
     private String orderPromotionType;
 
+    @ApiModelProperty(value = "是否退款")
+    private String groupIsRefund;
+
+    @ApiModelProperty(value = "退款金额")
+    private String groupRefundPrice;
+
     public List<OrderItemVO> getOrderItems() {
         if (CharSequenceUtil.isEmpty(groupGoodsId)) {
             return new ArrayList<>();
@@ -188,6 +194,12 @@ public class OrderSimpleVO {
         if (CharSequenceUtil.isNotEmpty(groupGoodsPrice) && groupGoodsPrice.split(",").length == groupGoodsId.split(",").length) {
             orderItemVO.setGoodsPrice(Double.parseDouble(groupGoodsPrice.split(",")[i]));
         }
+        if (CharSequenceUtil.isNotEmpty(groupIsRefund) && groupIsRefund.split(",").length == groupGoodsId.split(",").length) {
+            orderItemVO.setIsRefund(groupIsRefund.split(",")[i]);
+        }
+        if (CharSequenceUtil.isNotEmpty(groupRefundPrice) && groupRefundPrice.split(",").length == groupGoodsId.split(",").length) {
+            orderItemVO.setRefundPrice(groupRefundPrice.split(",")[i]);
+        }
         return orderItemVO;
     }
 
diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
index 03bf771d2..b21ccff45 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
@@ -71,6 +71,8 @@ public interface OrderMapper extends BaseMapper<Order> {
             ",GROUP_CONCAT(oi.comment_status) as group_comment_status" +
             ",GROUP_CONCAT(oi.sn) as group_order_items_sn " +
             ",GROUP_CONCAT(oi.goods_price) as group_goods_price " +
+            ",GROUP_CONCAT(oi.is_refund) as group_is_refund " +
+            ",GROUP_CONCAT(oi.refund_price) as group_refund_price " +
             " FROM li_order o LEFT JOIN li_order_item AS oi on o.sn = oi.order_sn ${ew.customSqlSegment} ")
     IPage<OrderSimpleVO> queryByParams(IPage<OrderSimpleVO> page, @Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper);