From c014190d15b41704085d2e96b3fb51d39d8c2016 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 12 Feb 2025 13:39:07 +0800
Subject: [PATCH] refactor(mall): 优化订单商品名称的显示格式

---
 src/main/resources/mapper/modules/MallGoodsMapper.xml |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index f335a63..4bf2c36 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -190,6 +190,9 @@
                 <if test="record.goodsType != null and record.goodsType != ''">
                     and a.goods_type=#{record.goodsType}
                 </if>
+                <if test="record.activityId != null">
+                    and a.activity_id=#{record.activityId}
+                </if>
             </if>
         </where>
         group by a.id
@@ -332,16 +335,12 @@
         select
         a.id,
         a.goods_name,
-        a.goods_introdution goodsIntroduction,
         a.thumb,
         a.unit,
         a.original_price,
         a.present_price,
         a.score,
         a.is_hot,
-        a.carriage_type,
-        a.carriage_amount,
-        a.carriage_rule_id,
         a.goods_weight,
         a.order_number,
         min(b.id) skuId,
@@ -360,6 +359,9 @@
                 <if test="record.isNormal != null and record.isNormal != ''">
                     and a.is_normal = #{record.isNormal}
                 </if>
+                <if test="record.isNormal == 3">
+                    and a.activity_id = #{record.activityId}
+                </if>
                 <if test="record.goodsType != null and record.goodsType != '' and record.goodsType != 3">
                     and a.goods_type = #{record.goodsType} and a.present_price != 0
                 </if>

--
Gitblit v1.9.1