From 7f5e6a6a45a75efdda362fa231a333616f4f10df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= <280645618@qq.com>
Date: Wed, 21 Jan 2026 18:35:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E5=BA=93BU?=
 =?UTF-8?q?G?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/qihangerp/mapper/OOrderItemMapper.java |  2 +-
 .../resources/mapper/OOrderItemMapper.xml     | 14 ++-------
 .../service/impl/OOrderServiceImpl.java       |  8 ++---
 vue/src/views/order/order_list.vue            | 30 +++++++++----------
 4 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/mapper/src/main/java/cn/qihangerp/mapper/OOrderItemMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OOrderItemMapper.java
index 3a918bbc..79069bb6 100644
--- a/mapper/src/main/java/cn/qihangerp/mapper/OOrderItemMapper.java
+++ b/mapper/src/main/java/cn/qihangerp/mapper/OOrderItemMapper.java
@@ -18,7 +18,7 @@ import java.util.List;
 */
 public interface OOrderItemMapper extends BaseMapper<OOrderItem> {
     Page<OrderItemListVo> selectPageVo(@Param("page") Page<OrderItemListVo> page, @Param("qw") OrderItemListBo qw);
-    List<OrderItemListVo> selectOrderItemListByOrderId(@Param("orderId") Long orderId);
+//    List<OrderItemListVo> selectOrderItemListByOrderId(@Param("orderId") Long orderId);
     List<SalesTopSkuVo> selectTopSku(@Param("startDate") String startDate, @Param("endDate") String endDate);
 }
 
diff --git a/mapper/src/main/resources/mapper/OOrderItemMapper.xml b/mapper/src/main/resources/mapper/OOrderItemMapper.xml
index f51917bf..3a6165d8 100644
--- a/mapper/src/main/resources/mapper/OOrderItemMapper.xml
+++ b/mapper/src/main/resources/mapper/OOrderItemMapper.xml
@@ -56,7 +56,7 @@
 
     <select id="selectPageVo" parameterType="cn.qihangerp.model.bo.OrderItemListBo" resultType="cn.qihangerp.model.vo.OrderItemListVo">
         SELECT
-        oi.*,o.shop_id,o.order_time,gs.outer_erp_sku_id
+        oi.*,o.shop_id,o.order_create_time as order_time,gs.outer_erp_sku_id
         FROM o_order_item as oi
         left join o_order as o on o.id = oi.order_id
         left join o_goods_sku as gs on gs.id = oi.goods_sku_id
@@ -74,10 +74,10 @@
             and oi.refund_status = #{qw.refundStatus}
         </if>
         <if test="qw.startTime!=null and qw.startTime != ''">
-            and o.order_time &gt;= #{qw.startTime}
+            and o.order_create_time &gt;= #{qw.startTime}
         </if>
         <if test="qw.endTime!=null and qw.endTime != ''">
-            and o.order_time &lt;= #{qw.endTime}
+            and o.order_create_time &lt;= #{qw.endTime}
         </if>
         <if test="qw.hasLink != null and qw.hasLink == 0">
             AND (oi.goods_sku_id is NULL or oi.goods_sku_id = 0)
@@ -88,15 +88,7 @@
 
     </select>
 
-    <select id="selectOrderItemListByOrderId" parameterType="Long" resultType="cn.qihangerp.model.vo.OrderItemListVo">
-        SELECT
-            oi.*,o.shop_id,o.order_time,gs.outer_erp_sku_id
-        FROM o_order_item as oi
-                 left join o_order as o on o.id = oi.order_id
-                 left join o_goods_sku as gs on gs.id = oi.goods_sku_id
-        WHERE oi.order_id = #{orderId}
 
-    </select>
     <select id="selectTopSku" resultType="cn.qihangerp.model.vo.SalesTopSkuVo">
         SELECT
             sku_num as `name`,
diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/OOrderServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OOrderServiceImpl.java
index faad6cf2..1d23c0bb 100644
--- a/service/src/main/java/cn/qihangerp/module/service/impl/OOrderServiceImpl.java
+++ b/service/src/main/java/cn/qihangerp/module/service/impl/OOrderServiceImpl.java
@@ -133,8 +133,8 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
         // 查询子订单
         if(pages.getRecords()!=null){
             for (var order:pages.getRecords()) {
-//                order.setItemList(orderItemMapper.selectList(new LambdaQueryWrapper<OOrderItem>().eq(OOrderItem::getOrderId, order.getId())));
-                order.setItemVoList(orderItemMapper.selectOrderItemListByOrderId(Long.parseLong(order.getId())));
+                order.setItemList(orderItemMapper.selectList(new LambdaQueryWrapper<OOrderItem>().eq(OOrderItem::getOrderId, order.getId())));
+//                order.setItemVoList(orderItemMapper.selectOrderItemListByOrderId(Long.parseLong(order.getId())));
             }
         }
 
@@ -145,8 +145,8 @@ public class OOrderServiceImpl extends ServiceImpl<OOrderMapper, OOrder>
     public OOrder queryDetailById(Long id) {
         OOrder oOrder = orderMapper.selectById(id);
         if(oOrder!=null) {
-//           oOrder.setItemList(orderItemMapper.selectList(new LambdaQueryWrapper<OOrderItem>().eq(OOrderItem::getOrderId, oOrder.getId())));
-            oOrder.setItemVoList(orderItemMapper.selectOrderItemListByOrderId(id));
+           oOrder.setItemList(orderItemMapper.selectList(new LambdaQueryWrapper<OOrderItem>().eq(OOrderItem::getOrderId, oOrder.getId())));
+//            oOrder.setItemVoList(orderItemMapper.selectOrderItemListByOrderId(id));
             // 获取优惠信息
             if(oOrder.getShopType()==EnumShopType.TAO.getIndex()){
                 oOrder.setDiscounts(orderMapper.getTaoOrderDiscount(oOrder.getOrderNum()));
diff --git a/vue/src/views/order/order_list.vue b/vue/src/views/order/order_list.vue
index 86dd803e..5692920a 100644
--- a/vue/src/views/order/order_list.vue
+++ b/vue/src/views/order/order_list.vue
@@ -127,7 +127,7 @@
           </table>
         </template>
         <template slot-scope="scope" >
-          <el-table :data="scope.row.itemVoList" :show-header="false" :cell-style="{border:0 + 'px' }"  :row-style="{border:0 + 'px' }" >
+          <el-table :data="scope.row.itemList" :show-header="false" :cell-style="{border:0 + 'px' }"  :row-style="{border:0 + 'px' }" >
             <el-table-column label="商品图片" width="50px">
               <template slot-scope="scope">
 <!--                <el-image  style="width: 40px; height: 40px;" :src="scope.row.goodsImg" :preview-src-list="[scope.row.goodsImg]"></el-image>-->
@@ -283,7 +283,7 @@
     />
 
     <!-- 订单详情对话框 -->
-    <el-dialog :title="detailTitle" :visible.sync="detailOpen" width="1100px" append-to-body>
+    <el-dialog :title="detailTitle" :visible.sync="detailOpen" width="1200px" append-to-body>
       <el-tabs v-model="activeName" >
         <el-tab-pane label="订单详情" name="orderDetail">
           <el-form ref="form" :model="form" :rules="rules" label-width="80px" inline>
@@ -361,33 +361,33 @@
 
         </el-tab-pane>
         <el-tab-pane label="商品列表" name="orderItems" lazy>
-          <el-table :data="form.itemVoList"  style="margin-bottom: 10px;">
+          <el-table :data="form.itemList"  style="margin-bottom: 10px;">
             <!-- <el-table-column type="selection" width="50" align="center" /> -->
             <el-table-column label="序号" align="center" type="index" width="50"/>
 
-            <el-table-column label="商品图片" prop="goodsImg" width="80">
+            <el-table-column label="图片" prop="goodsImg" width="80">
               <template slot-scope="scope">
-                <el-image style="width: 70px; height: 70px" :src="scope.row.goodsImg"></el-image>
+                <el-image style="width: 40px; height: 40px" :src="scope.row.goodsImg"></el-image>
               </template>
             </el-table-column>
-            <el-table-column label="商品标题" prop="goodsTitle" ></el-table-column>
+            <el-table-column label="商品标题" prop="goodsTitle" width="300"></el-table-column>
             <el-table-column label="规格" prop="goodsSpec" width="150">
               <template slot-scope="scope">
                 {{ getSkuValues(scope.row.goodsSpec)}}
               </template>
             </el-table-column>
-            <el-table-column label="sku编码" prop="skuNum"></el-table-column>
-            <el-table-column label="商品库SKUID" prop="goodsSkuId"></el-table-column>
-            <el-table-column label="单价" prop="goodsPrice"></el-table-column>
-            <el-table-column label="子订单金额" prop="itemAmount"></el-table-column>
-            <el-table-column label="实付金额" prop="payment"></el-table-column>
+<!--            <el-table-column label="sku编码" prop="skuNum"></el-table-column>-->
+            <el-table-column label="平台SkuId" prop="skuId"></el-table-column>
+            <el-table-column label="商品库SkuId" prop="goodsSkuId"></el-table-column>
+<!--            <el-table-column label="单价" prop="goodsPrice"></el-table-column>-->
             <el-table-column label="数量" prop="quantity"></el-table-column>
+            <el-table-column label="金额" prop="itemAmount" :formatter="amountFormatter"></el-table-column>
+<!--            <el-table-column label="实付金额" prop="payment"></el-table-column>-->
+
             <el-table-column label="状态" prop="orderStatus">
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.orderStatus === 1">待发货</el-tag>
-                <el-tag v-if="scope.row.orderStatus === 2">已发货</el-tag>
-                <el-tag v-if="scope.row.orderStatus === 3">已完成</el-tag>
-                <el-tag v-if="scope.row.orderStatus === 11">已取消</el-tag>
+                <el-tag v-if="scope.row.refundStatus === 1">无售后或售后关闭</el-tag>
+                <el-tag v-else>已退款</el-tag>
               </template>
             </el-table-column>
 <!--            <el-table-column label="退款状态" prop="refundStatus">-->