From c3ee5dd9cda004b034fd586b87eda13d99ef054d Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 24 Jan 2025 10:28:02 +0800
Subject: [PATCH] refactor(mall): 修复 API 订单列表接口
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index e1f180e..44d16a2 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -127,6 +127,7 @@
<result column="take_unique_code" property="takeUniqueCode" />
<result column="delivery_state" property="deliveryState" />
<result column="is_home" property="isHome" />
+ <result column="is_free" property="isFree" />
<result column="del_flag" property="delFlag" />
<result column="leader_name" property="leaderName" />
<result column="leader_phone" property="leaderPhone" />
@@ -215,7 +216,7 @@
a.status,
count(1) cnt
from mall_order_info a
- where a.del_flag=2 and a.member_id=#{memberId}
+ where a.del_flag=2 and a.member_id=#{memberId} and order_type = 1
group by a.status
</select>
@@ -374,6 +375,7 @@
<result column="take_unique_code" property="takeUniqueCode" />
<result column="delivery_state" property="deliveryState" />
<result column="is_home" property="isHome" />
+ <result column="is_free" property="isFree" />
<result column="del_flag" property="delFlag" />
<result column="leader_name" property="leaderName" />
<result column="leader_phone" property="leaderPhone" />
@@ -386,12 +388,15 @@
<result column="city" property="city" />
<result column="township" property="township" />
<result column="detail_address" property="detailAddress" />
+ <result column="express_no" property="expressNo" />
</resultMap>
<select id="selectNewApiOrderListInPage" resultMap="NewOrderInfoMap">
select
a.*
+ ,express.express_no
from mall_order_info a
+ left join mall_express_info express on a.id=express.order_id
<where>
a.del_flag=2
<if test="record.memberId != null">
@@ -434,6 +439,7 @@
<select id="getGoodsStatisticsInPage" resultType="cc.mrbird.febs.mall.vo.AdminGoodsStatisticsVo">
select
goods_name goodsName,
+ sku_name skuName,
SUM(cnt) goodsCnt
from mall_order_item
<where>
@@ -445,8 +451,8 @@
</foreach>
</if>
</where>
- GROUP BY goods_id
- ORDER BY goods_id desc
+ GROUP BY sku_id
+ ORDER BY sku_id desc
</select>
<select id="selectAmountOrTeamAmount" resultType="java.math.BigDecimal">
--
Gitblit v1.9.1