会员管理代码

baqing-shop/src/main/java/com/ruoyi/web/modules/order/dto/OrderAftersaleStatusRow.java

@@ -0,0 +1,32 @@
+package com.ruoyi.web.modules.order.dto;
+
+/**
+ * 订单维度售后状态聚合（列表批量查询）
+ */
+public class OrderAftersaleStatusRow
+{
+    private Long orderId;
+
+    /** 1 进行中 2 已完结（同 biz_order_aftersale.aftersale_status） */
+    private String aftersaleStatus;
+
+    public Long getOrderId()
+    {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId)
+    {
+        this.orderId = orderId;
+    }
+
+    public String getAftersaleStatus()
+    {
+        return aftersaleStatus;
+    }
+
+    public void setAftersaleStatus(String aftersaleStatus)
+    {
+        this.aftersaleStatus = aftersaleStatus;
+    }
+}

baqing-shop/src/main/java/com/ruoyi/web/modules/order/mapper/BizOrderAftersaleMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.modules.order.mapper;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import com.ruoyi.web.modules.order.domain.BizOrderAftersale;
+import com.ruoyi.web.modules.order.dto.OrderAftersaleStatusRow;
 import com.ruoyi.web.modules.order.dto.SellerAftersaleQuery;
 import com.ruoyi.web.modules.order.vo.SellerAftersaleDetailVO;
 import com.ruoyi.web.modules.order.vo.SellerAftersaleListRowVO;
@@ -17,6 +18,8 @@ public interface BizOrderAftersaleMapper
 
     int countInProgressByOrderItem(@Param("orderItemId") Long orderItemId);
 
+    List<OrderAftersaleStatusRow> selectAftersaleStatusByOrderIds(@Param("orderIds") List<Long> orderIds);
+
     List<BizOrderAftersale> selectMemberList(@Param("memberId") Long memberId, @Param("tab") String tab);
 
     List<SellerAftersaleListRowVO> selectSellerList(@Param("shopId") Long shopId,

baqing-shop/src/main/java/com/ruoyi/web/modules/order/service/impl/OrderAppServiceImpl.java

@@ -23,6 +23,7 @@ import com.ruoyi.web.modules.order.domain.BizOrder;
 import com.ruoyi.web.modules.order.domain.BizOrderItem;
 import com.ruoyi.web.modules.order.domain.BizOrderLogisticsTrace;
 import com.ruoyi.web.modules.order.dto.OrderAppListQueryDTO;
+import com.ruoyi.web.modules.order.dto.OrderAftersaleStatusRow;
 import com.ruoyi.web.modules.order.mapper.BizGoodsReviewMapper;
 import com.ruoyi.web.modules.order.mapper.BizOrderAftersaleMapper;
 import com.ruoyi.web.modules.order.mapper.BizOrderItemMapper;
@@ -219,6 +220,7 @@ public class OrderAppServiceImpl implements IOrderAppService
         }
         List<BizGoodsReview> reviews = reviewMapper.selectByOrderIds(orderIds);
         Map<Long, String> shopAvatarMap = loadShopAvatars(orders);
+        Map<Long, String> aftersaleStatusMap = loadAftersaleStatusMap(orderIds);
         List<OrderAppListRowVO> rows = new ArrayList<>(orders.size());
         for (BizOrder order : orders)
         {
@@ -232,6 +234,7 @@ public class OrderAppServiceImpl implements IOrderAppService
             row.setOrderNo(order.getOrderNo());
             row.setOrderStatus(order.getOrderStatus());
             row.setOrderStatusText(orderAppSupport.toStatusText(order.getOrderStatus()));
+            row.setAftersaleStatus(aftersaleStatusMap.get(order.getOrderId()));
             row.setShopId(order.getShopId());
             row.setShopName(order.getShopName());
             row.setShopAvatar(shopAvatarMap.get(order.getShopId()));
@@ -260,6 +263,28 @@ public class OrderAppServiceImpl implements IOrderAppService
         return rows;
     }
 
+    private Map<Long, String> loadAftersaleStatusMap(List<Long> orderIds)
+    {
+        if (orderIds == null || orderIds.isEmpty())
+        {
+            return Collections.emptyMap();
+        }
+        List<OrderAftersaleStatusRow> rows = aftersaleMapper.selectAftersaleStatusByOrderIds(orderIds);
+        if (rows == null || rows.isEmpty())
+        {
+            return Collections.emptyMap();
+        }
+        Map<Long, String> map = new HashMap<>(rows.size());
+        for (OrderAftersaleStatusRow row : rows)
+        {
+            if (row.getOrderId() != null)
+            {
+                map.put(row.getOrderId(), row.getAftersaleStatus());
+            }
+        }
+        return map;
+    }
+
     private Map<Long, String> loadShopAvatars(List<BizOrder> orders)
     {
         Map<Long, String> map = new HashMap<>();

baqing-shop/src/main/java/com/ruoyi/web/modules/order/support/OrderAppSupport.java

@@ -60,7 +60,7 @@ public class OrderAppSupport
         {
             return "已关闭";
         }
-        return dictLabel(OrderConstants.DICT_ORDER_STATUS, orderStatus);
+        return toStatusText(orderStatus);
     }
 
     public String toCloseTypeText(String closeType)

baqing-shop/src/main/java/com/ruoyi/web/modules/order/vo/OrderAppListRowVO.java

@@ -45,6 +45,9 @@ public class OrderAppListRowVO
 
     private String reviewStatus;
 
+    /** 售后状态：null 无售后；1 进行中；2 已完结 */
+    private String aftersaleStatus;
+
     private List<String> actions = new ArrayList<>();
 
     public Long getOrderId()
@@ -207,6 +210,16 @@ public class OrderAppListRowVO
         this.reviewStatus = reviewStatus;
     }
 
+    public String getAftersaleStatus()
+    {
+        return aftersaleStatus;
+    }
+
+    public void setAftersaleStatus(String aftersaleStatus)
+    {
+        this.aftersaleStatus = aftersaleStatus;
+    }
+
     public List<String> getActions()
     {
         return actions;

baqing-shop/src/main/resources/mapper/order/BizOrderAftersaleMapper.xml

@@ -60,6 +60,18 @@
         where order_item_id = #{orderItemId} and aftersale_status = '1'
     </select>
 
+    <select id="selectAftersaleStatusByOrderIds"
+            resultType="com.ruoyi.web.modules.order.dto.OrderAftersaleStatusRow">
+        select order_id as orderId,
+               if(sum(case when aftersale_status = '1' then 1 else 0 end) &gt; 0, '1', '2') as aftersaleStatus
+        from biz_order_aftersale
+        where order_id in
+        <foreach collection="orderIds" item="orderId" open="(" separator="," close=")">
+            #{orderId}
+        </foreach>
+        group by order_id
+    </select>
+
     <select id="selectMemberList" resultMap="BizOrderAftersaleResult">
         select * from biz_order_aftersale
         where member_id = #{memberId}

baqing-shop/src/test/java/com/ruoyi/web/modules/order/service/OrderAppServiceImplTest.java

@@ -113,6 +113,8 @@ class OrderAppServiceImplTest
         when(orderItemMapper.selectByOrderIds(Collections.singletonList(ORDER_ID)))
                 .thenReturn(java.util.Arrays.asList(item1, item2));
         when(reviewMapper.selectByOrderIds(Collections.singletonList(ORDER_ID))).thenReturn(Collections.emptyList());
+        when(aftersaleMapper.selectAftersaleStatusByOrderIds(Collections.singletonList(ORDER_ID)))
+                .thenReturn(Collections.emptyList());
         when(shopMapper.selectById(10L)).thenReturn(null);
         when(orderAppSupport.toStatusText(order.getOrderStatus())).thenReturn("待付款");
         when(orderAppSupport.toItemSummary(item1)).thenReturn(summary(item1));
@@ -133,6 +135,76 @@ class OrderAppServiceImplTest
         assertEquals(row.getItems().get(0), row.getFirstItem());
     }
 
+    @Test
+    void list_withInProgressAftersale_setsAftersaleStatus()
+    {
+        when(memberFacade.isMemberEnabled(MEMBER_ID)).thenReturn(true);
+        BizOrder order = pendingOrder();
+        order.setOrderStatus(OrderConstants.STATUS_PENDING_SHIP);
+        order.setShopId(10L);
+        when(orderMapper.selectMemberAppList(eq(MEMBER_ID), any())).thenReturn(Collections.singletonList(order));
+        when(orderItemMapper.selectByOrderIds(Collections.singletonList(ORDER_ID)))
+                .thenReturn(Collections.singletonList(singleItem()));
+        when(reviewMapper.selectByOrderIds(Collections.singletonList(ORDER_ID))).thenReturn(Collections.emptyList());
+        com.ruoyi.web.modules.order.dto.OrderAftersaleStatusRow statusRow =
+                new com.ruoyi.web.modules.order.dto.OrderAftersaleStatusRow();
+        statusRow.setOrderId(ORDER_ID);
+        statusRow.setAftersaleStatus(OrderAppConstants.AFTERSALE_STATUS_IN_PROGRESS);
+        when(aftersaleMapper.selectAftersaleStatusByOrderIds(Collections.singletonList(ORDER_ID)))
+                .thenReturn(Collections.singletonList(statusRow));
+        when(shopMapper.selectById(10L)).thenReturn(null);
+        when(orderAppSupport.toStatusText(order.getOrderStatus())).thenReturn("待发货");
+        when(orderAppSupport.toItemSummary(any())).thenReturn(new com.ruoyi.web.modules.order.vo.OrderAppItemSummaryVO());
+        when(orderAppSupport.indexReviewsByItemId(any(), any())).thenReturn(Collections.emptyMap());
+        when(orderAppSupport.calcPayRemainSeconds(order)).thenReturn(0L);
+        when(orderAppSupport.resolveReviewStatus(eq(order), any(), any()))
+                .thenReturn(OrderAppConstants.REVIEW_STATUS_NONE);
+        when(orderAppSupport.resolveActions(order)).thenReturn(Collections.emptyList());
+
+        com.ruoyi.web.modules.order.vo.OrderAppListRowVO row =
+                orderAppService.list(MEMBER_ID, new com.ruoyi.web.modules.order.dto.OrderAppListQueryDTO()).get(0);
+
+        assertEquals("待发货", row.getOrderStatusText());
+        assertEquals(OrderAppConstants.AFTERSALE_STATUS_IN_PROGRESS, row.getAftersaleStatus());
+    }
+
+    @Test
+    void list_withoutAftersale_aftersaleStatusNull()
+    {
+        when(memberFacade.isMemberEnabled(MEMBER_ID)).thenReturn(true);
+        BizOrder order = pendingOrder();
+        order.setShopId(10L);
+        when(orderMapper.selectMemberAppList(eq(MEMBER_ID), any())).thenReturn(Collections.singletonList(order));
+        when(orderItemMapper.selectByOrderIds(Collections.singletonList(ORDER_ID)))
+                .thenReturn(Collections.singletonList(singleItem()));
+        when(reviewMapper.selectByOrderIds(Collections.singletonList(ORDER_ID))).thenReturn(Collections.emptyList());
+        when(aftersaleMapper.selectAftersaleStatusByOrderIds(Collections.singletonList(ORDER_ID)))
+                .thenReturn(Collections.emptyList());
+        when(shopMapper.selectById(10L)).thenReturn(null);
+        when(orderAppSupport.toStatusText(order.getOrderStatus())).thenReturn("待付款");
+        when(orderAppSupport.toItemSummary(any())).thenReturn(new com.ruoyi.web.modules.order.vo.OrderAppItemSummaryVO());
+        when(orderAppSupport.indexReviewsByItemId(any(), any())).thenReturn(Collections.emptyMap());
+        when(orderAppSupport.calcPayRemainSeconds(order)).thenReturn(3600L);
+        when(orderAppSupport.resolveReviewStatus(eq(order), any(), any()))
+                .thenReturn(OrderAppConstants.REVIEW_STATUS_NONE);
+        when(orderAppSupport.resolveActions(order)).thenReturn(Collections.emptyList());
+
+        com.ruoyi.web.modules.order.vo.OrderAppListRowVO row =
+                orderAppService.list(MEMBER_ID, new com.ruoyi.web.modules.order.dto.OrderAppListQueryDTO()).get(0);
+
+        assertEquals(null, row.getAftersaleStatus());
+    }
+
+    private BizOrderItem singleItem()
+    {
+        BizOrderItem item = new BizOrderItem();
+        item.setItemId(1L);
+        item.setOrderId(ORDER_ID);
+        item.setGoodsId(101L);
+        item.setGoodsName("商品A");
+        return item;
+    }
+
     private com.ruoyi.web.modules.order.vo.OrderAppItemSummaryVO summary(BizOrderItem item)
     {
         com.ruoyi.web.modules.order.vo.OrderAppItemSummaryVO vo =

doc/消费者APP/我的订单/我的订单技术方案.md

@@ -286,7 +286,8 @@ CREATE TABLE IF NOT EXISTS `biz_order_aftersale` (
 | 字段 | 说明 |
 |------|------|
 | orderId / orderNo / orderStatus | |
-| orderStatusText | C 端文案：待付款/待发货/待收货/交易成功/已关闭 |
+| orderStatusText | **订单主状态**文案：待付款/待发货/待收货/交易成功/已关闭；**不因售后覆盖** |
+| aftersaleStatus | **售后状态**：`null` 无售后；`1` 进行中；`2` 已完结；与 `biz_order_aftersale.aftersale_status` 一致（同订单多条售后时：**有进行中则 1**，否则 **2**） |
 | shopId / shopName / shopAvatar | |
 | payAmount / goodsAmount / freightAmount | |
 | createTime | 下单时间；JSON **`yyyy-MM-dd HH:mm:ss`** |
@@ -498,7 +499,7 @@ public static final String REVIEW_TAB_PENDING = "PENDING";
 public static final String REVIEW_TAB_DONE = "DONE";
 ```
 
-**C 端状态文案映射：**
+**C 端状态文案映射（`orderStatusText`）：**
 
 | order_status | orderStatusText |
 |--------------|-----------------|
@@ -508,6 +509,16 @@ public static final String REVIEW_TAB_DONE = "DONE";
 | 3 | 交易成功 |
 | 4 | 已关闭 |
 
+**列表卡片售后展示（前端，`aftersaleStatus` → 卡片角标/状态区文案）：**
+
+| aftersaleStatus | 前端展示文案 |
+|-----------------|--------------|
+| null | 使用 `orderStatusText` |
+| 1 | 售后处理中 |
+| 2 | 售后已完成 |
+
+> **实现：** `OrderAppServiceImpl.buildListRows` 批量 `selectAftersaleStatusByOrderIds`；**不修改** `orderStatusText`。映射见《我的订单前端技术方案》`orderDisplay.js` · `mapOrderListRow`。
+
 ---
 
 ## 6. 与平台后台联动
@@ -519,7 +530,7 @@ public static final String REVIEW_TAB_DONE = "DONE";
 | O8 超时关单 | 待付款消失；**已关闭**；续付失败 |
 | 运营关闭 | **已关闭** + closeTypeText |
 | 会员禁用 | **403**；历史单只读 **不可操作** |
-| 商家完结售后 | 售后列表 **已完结**；展示 processResult |
+| 商家完结售后 | 列表 `aftersaleStatus=2`；订单主状态可能为 **已关闭**（`order_status=4`）；售后专区 **已完结** |
 
 ---
 
@@ -599,8 +610,9 @@ public static final String REVIEW_TAB_DONE = "DONE";
 | 版本 | 说明 |
 |------|------|
 | **v1.2** | 列表返回 `items[]` 全量；评价改 **一行一评**；行级 `reviewStatus`；底部 actions 不含评价 |
+| **v1.3** | 列表新增 `aftersaleStatus`（null/1/2）；`orderStatusText` 保持订单主状态；售后展示文案由 **前端** 映射 |
 | **v1.0** | 首版：列表/详情/角标/确认收货/评价/售后；复用 order 模块与 checkout 已建 pay；新增 aftersale DDL 规划 |
 
 ---
 
-*文档版本：v1.2 · 关联《我的订单功能需求.md》v1.1、《确认订单页（多商品）技术方案.md》v1.1、《订单管理技术方案.md》v1.0.2 · DDL：[`sql/biz_order.sql`](../../../sql/biz_order.sql)、[`sql/biz_goods_review.sql`](../../../sql/biz_goods_review.sql)、[`sql/biz_goods_review_order_item_uk.sql`](../../../sql/biz_goods_review_order_item_uk.sql)、`sql/biz_order_aftersale.sql`*
+*文档版本：v1.3 · 关联《我的订单功能需求.md》v1.2、《确认订单页（多商品）技术方案.md》v1.1、《订单管理技术方案.md》v1.0.2 · DDL：[`sql/biz_order.sql`](../../../sql/biz_order.sql)、[`sql/biz_goods_review.sql`](../../../sql/biz_goods_review.sql)、[`sql/biz_goods_review_order_item_uk.sql`](../../../sql/biz_goods_review_order_item_uk.sql)、`sql/biz_order_aftersale.sql`*