From ac9126763134c6eaf7eb96c6ed597809a6d7fc8b Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 10 Oct 2025 10:04:51 +0800
Subject: [PATCH] feat(mall): 添加会员公司信息展示功能
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 9799286..4a0eaa0 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -127,6 +127,7 @@
<result column="take_code" property="takeCode" />
<result column="take_unique_code" property="takeUniqueCode" />
<result column="delivery_state" property="deliveryState" />
+ <result column="delivery_state" property="deliveryState" />
<result column="is_home" property="isHome" />
<result column="is_free" property="isFree" />
<result column="del_flag" property="delFlag" />
@@ -157,6 +158,9 @@
<result property="memberInviteId" column="member_invite_id" />
<result property="memberCouponId" column="member_coupon_id" />
<result property="state" column="state" />
+ <result property="itemScoreAmount" column="item_score_amount" />
+ <result property="itemAmount" column="item_amount" />
+ <result property="itemScorePrice" column="item_score_price" />
</collection>
</resultMap>
@@ -204,11 +208,16 @@
b.cnt,
b.price,
b.amount,
+ b.amount as item_amount ,
+ b.score_amount as item_score_amount ,
+ FLOOR((c.original_price * d.static_prop)/100) as item_score_price ,
b.member_invite_id,
b.member_coupon_id,
b.is_normal
from mall_order_info a
- inner join mall_order_item b on a.id=b.order_id
+ left join mall_order_item b on a.id=b.order_id
+ left join mall_goods_sku c on c.id=b.sku_id
+ left join mall_goods d on d.id=b.goods_id
where a.id=#{id}
</select>
@@ -443,9 +452,6 @@
</if>
<if test="record.status == 5">
and a.status = 7 or b.state in (2,3)
- </if>
- <if test="record.orderType != null">
- and a.order_type=#{record.orderType}
</if>
</where>
order by a.created_time desc
--
Gitblit v1.9.1