售后

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

@@ -271,7 +271,13 @@
         <if test="query != null and query.tab != null and query.tab != '' and query.tab != 'ALL'">
             <choose>
                 <when test="query.tab == 'PENDING_PAY'">and o.order_status = '0'</when>
-                <when test="query.tab == 'PENDING_SHIP'">and o.order_status = '1'</when>
+                <when test="query.tab == 'PENDING_SHIP'">
+                    and o.order_status = '1'
+                    and not exists (
+                        select 1 from biz_order_aftersale a
+                        where a.order_id = o.order_id and a.aftersale_status = '2'
+                    )
+                </when>
                 <when test="query.tab == 'PENDING_RECEIVE'">and o.order_status = '2'</when>
                 <when test="query.tab == 'COMPLETED'">and o.order_status = '3'</when>
                 <when test="query.tab == 'CLOSED'">and o.order_status = '4'</when>
@@ -303,8 +309,14 @@
     </select>
 
     <select id="countMemberByStatus" resultType="int">
-        select count(1) from biz_order
-        where member_id = #{memberId} and order_status = #{orderStatus} and del_flag = '0'
+        select count(1) from biz_order o
+        where o.member_id = #{memberId} and o.order_status = #{orderStatus} and o.del_flag = '0'
+        <if test="orderStatus == '1'">
+            and not exists (
+                select 1 from biz_order_aftersale a
+                where a.order_id = o.order_id and a.aftersale_status = '2'
+            )
+        </if>
     </select>
 
     <select id="countShopByStatus" resultType="int">

ruoyi-ui/src/views/agri/seller/aftersale/index.vue

@@ -135,7 +135,7 @@
     <!-- 处理售后弹窗 -->
     <el-dialog title="处理售后" :visible.sync="finishOpen" width="560px" append-to-body @close="cancelFinish">
       <el-alert
-        title="完结后不可回退，处理结果将同步展示给买家；本操作不自动退款或变更订单状态。"
+        title="完结后不可回退，处理结果将同步展示给买家。"
         type="warning"
         :closable="false"
         show-icon

shop-app/subpackage/order/detail.vue

@@ -106,7 +106,11 @@
 import { ref, computed } from 'vue'
 import { onLoad, onShow } from '@dcloudio/uni-app'
 import { getOrderDetail } from '@/api/order'
-import { mapOrderDetail, getItemReviewAction } from '@/utils/orderDisplay'
+import {
+	mapOrderDetail,
+	getItemReviewAction,
+	resolveOrderAftersaleStatus
+} from '@/utils/orderDisplay'
 import { ensureApiToken } from '@/utils/apiAuth'
 import { ORDER_ACTION } from '@/constants/order'
 import { runOrderAction, openPayModal } from '@/utils/orderAction'
@@ -119,6 +123,7 @@ import OrderActionBar from '@/components/order/OrderActionBar.vue'
 const actionGuard = useActionGuard()
 
 const orderId = ref('')
+const routeAftersaleStatus = ref('')
 const detail = ref(null)
 const pageLoading = ref(true)
 const pageError = ref('')
@@ -150,7 +155,11 @@ async function loadDetail() {
 	pageError.value = ''
 	try {
 		const res = await getOrderDetail(orderId.value)
-		detail.value = mapOrderDetail(res.data)
+		let aftersaleStatus = routeAftersaleStatus.value || null
+		if (!aftersaleStatus) {
+			aftersaleStatus = await resolveOrderAftersaleStatus(orderId.value)
+		}
+		detail.value = mapOrderDetail(res.data, { aftersaleStatus })
 		if (!detail.value) {
 			throw new Error('订单数据异常')
 		}
@@ -201,6 +210,7 @@ function onAction(code) {
 
 onLoad((options) => {
 	orderId.value = options.orderId || ''
+	routeAftersaleStatus.value = options.aftersaleStatus || ''
 	if (!orderId.value) {
 		pageError.value = '订单信息缺失'
 		pageLoading.value = false

shop-app/subpackage/order/list.vue

@@ -194,7 +194,7 @@ function onLoadMore() {
 }
 
 function onCardClick(card) {
-	goOrderDetail(card.orderId)
+	goOrderDetail(card.orderId, card.aftersaleStatus)
 }
 
 function onItemReview(card, item, code) {

shop-app/utils/orderDisplay.js

@@ -1,13 +1,16 @@
 import { resolveFileUrl } from '@/utils/image'
 import { formatPrice } from '@/utils/format'
 import { parseCartSpecText } from '@/utils/cartSpec'
+import { listAftersales } from '@/api/orderAftersale'
 import {
   ORDER_ACTION,
   ORDER_ACTION_LABEL,
   REVIEW_ITEM_STATUS,
   AFTERSALE_APPLY_TYPE_OPTIONS,
+  AFTERSALE_TAB,
   ORDER_STATUS,
-  ORDER_AFTERSALE_CARD_LABEL
+  ORDER_AFTERSALE_CARD_LABEL,
+  ORDER_AFTERSALE_CARD_STATUS
 } from '@/constants/order'
 
 /** 订单级不再展示的评价按钮（改在商品行） */
@@ -82,9 +85,20 @@ function mapOrderItemRow(row) {
   }
 }
 
-function mapActions(actions) {
+/** 订单已有进行中/已完结售后时，不再展示「申请售后」 */
+export function hasOrderAftersale(aftersaleStatus) {
+  const status = aftersaleStatus != null ? String(aftersaleStatus) : ''
+  return (
+    status === ORDER_AFTERSALE_CARD_STATUS.IN_PROGRESS ||
+    status === ORDER_AFTERSALE_CARD_STATUS.FINISHED
+  )
+}
+
+function mapActions(actions, aftersaleStatus) {
+  const hideAftersale = hasOrderAftersale(aftersaleStatus)
   return (actions || [])
     .filter((code) => !ORDER_LEVEL_REVIEW_CODES.includes(code))
+    .filter((code) => !(hideAftersale && code === ORDER_ACTION.AFTERSALE))
     .map((code) => ({
       code,
       label: ORDER_ACTION_LABEL[code] || code
@@ -92,6 +106,34 @@ function mapActions(actions) {
     .filter((item) => item.label)
 }
 
+/** 详情页补查订单售后态（列表接口有 aftersaleStatus，详情接口暂无） */
+export async function resolveOrderAftersaleStatus(orderId) {
+  if (!orderId) return null
+  try {
+    const inProgressRes = await listAftersales({
+      tab: AFTERSALE_TAB.IN_PROGRESS,
+      pageNum: 1,
+      pageSize: 100
+    })
+    const inProgressRows = inProgressRes.rows || []
+    if (inProgressRows.some((row) => String(row.orderId) === String(orderId))) {
+      return ORDER_AFTERSALE_CARD_STATUS.IN_PROGRESS
+    }
+    const finishedRes = await listAftersales({
+      tab: AFTERSALE_TAB.FINISHED,
+      pageNum: 1,
+      pageSize: 100
+    })
+    const finishedRows = finishedRes.rows || []
+    if (finishedRows.some((row) => String(row.orderId) === String(orderId))) {
+      return ORDER_AFTERSALE_CARD_STATUS.FINISHED
+    }
+  } catch (e) {
+    // 查询失败时不阻断详情展示
+  }
+  return null
+}
+
 /** 交易成功商品行：待评价→评价，已评价→查看评价 */
 export function getItemReviewAction(item) {
   if (!item || !item.reviewStatus) return null
@@ -154,13 +196,20 @@ function trimText(text, maxLen, emptyFallback = '') {
 }
 
 /**
- * 列表卡片状态文案（MO-L4）
- * 有 aftersaleStatus 时优先展示售后态，否则用订单主状态文案
+ * 列表卡片状态文案（MO-L4 调整）
+ * 仅「售后处理中」覆盖主状态；售后已完结后订单应变已关闭，列表不再展示「售后已完成」
  */
-export function mapOrderCardStatusText(orderStatusText, aftersaleStatus) {
-  if (aftersaleStatus && ORDER_AFTERSALE_CARD_LABEL[aftersaleStatus]) {
+export function mapOrderCardStatusText(orderStatusText, aftersaleStatus, orderStatus) {
+  if (aftersaleStatus === ORDER_AFTERSALE_CARD_STATUS.IN_PROGRESS) {
     return ORDER_AFTERSALE_CARD_LABEL[aftersaleStatus]
   }
+  if (aftersaleStatus === ORDER_AFTERSALE_CARD_STATUS.FINISHED) {
+    if (orderStatus === ORDER_STATUS.CLOSED) {
+      return orderStatusText || '已关闭'
+    }
+    // 售后已完结但订单主状态未同步（异常数据）时，仍按已关闭展示
+    return '已关闭'
+  }
   return orderStatusText || ''
 }
 
@@ -182,8 +231,8 @@ export function mapOrderListRow(row) {
     orderStatus: row.orderStatus,
     orderStatusText,
     aftersaleStatus,
-    statusText: mapOrderCardStatusText(orderStatusText, aftersaleStatus),
-    statusIsAftersale: !!aftersaleStatus,
+    statusText: mapOrderCardStatusText(orderStatusText, aftersaleStatus, row.orderStatus),
+    statusIsAftersale: aftersaleStatus === ORDER_AFTERSALE_CARD_STATUS.IN_PROGRESS,
     amountLabel: row.orderStatus === ORDER_STATUS.PENDING_PAY ? '应付' : '实付',
     shopId: row.shopId,
     shopName: row.shopName || '',
@@ -198,15 +247,16 @@ export function mapOrderListRow(row) {
     firstItem,
     payRemainSeconds: row.payRemainSeconds,
     reviewStatus: row.reviewStatus,
-    actions: mapActions(row.actions)
+    actions: mapActions(row.actions, aftersaleStatus)
   }
 }
 
-/** 详情 VO → 页面模型 */
-export function mapOrderDetail(data) {
+/** 详情 VO → 页面模型；options.aftersaleStatus 用于补全售后态并过滤操作按钮 */
+export function mapOrderDetail(data, options = {}) {
   if (!data) return null
   const items = (data.items || []).map(mapOrderItemRow).filter(Boolean)
   const latestTrace = data.latestTrace || null
+  const aftersaleStatus = data.aftersaleStatus || options.aftersaleStatus || null
   return {
     orderId: data.orderId,
     orderNo: data.orderNo || '',
@@ -253,7 +303,8 @@ export function mapOrderDetail(data) {
     items,
     reviewStatus: data.reviewStatus,
     reviewId: data.reviewId,
-    actions: mapActions(data.actions)
+    aftersaleStatus,
+    actions: mapActions(data.actions, aftersaleStatus)
   }
 }
 

shop-app/utils/orderNav.js

@@ -22,11 +22,15 @@ export function goOrderList(tab = ORDER_TAB.ALL) {
   })
 }
 
-/** 订单详情 */
-export function goOrderDetail(orderId) {
+/** 订单详情（可选带 aftersaleStatus，用于隐藏「申请售后」） */
+export function goOrderDetail(orderId, aftersaleStatus) {
   if (!orderId) return
+  const parts = [`orderId=${orderId}`]
+  if (aftersaleStatus != null && aftersaleStatus !== '') {
+    parts.push(`aftersaleStatus=${aftersaleStatus}`)
+  }
   uni.navigateTo({
-    url: `${PAGE_ORDER_DETAIL}?orderId=${orderId}`
+    url: `${PAGE_ORDER_DETAIL}?${parts.join('&')}`
   })
 }