From 068fe86cffc98f31a0b83bee34fa2dce6b23b736 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 04 Jun 2024 10:10:47 +0800
Subject: [PATCH] 退款
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 7a5741d..58297b2 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" />
@@ -158,9 +159,9 @@
</collection>
</resultMap>
- <select id="selectApiOrderListInPage" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
+ <select id="selectApiOrderListInPage" resultMap="OrderInfoMap">
select
- a.*
+ *
from mall_order_info a
inner join mall_order_item b on a.id=b.order_id
<where>
@@ -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" />
@@ -436,7 +438,7 @@
<select id="getGoodsStatisticsInPage" resultType="cc.mrbird.febs.mall.vo.AdminGoodsStatisticsVo">
select
- goods_name goodsName,
+ CONCAT(goods_name, '---', sku_name) goodsName,
SUM(cnt) goodsCnt
from mall_order_item
<where>
@@ -448,7 +450,7 @@
</foreach>
</if>
</where>
- GROUP BY goods_id
+ GROUP BY goods_id,goods_name,sku_name
ORDER BY goods_id desc
</select>
@@ -456,12 +458,12 @@
select IFNULL(sum(IFNULL(a.amount,0)),0) from mall_order_info a
inner join mall_member b on a.member_id=b.ID
<where>
- a.status in (2,3,4)
+ a.status = 4
<if test="type == 1">
and b.invite_id=#{inviteId}
</if>
<if test="type == 2">
- and FIND_IN_SET(#{inviteId},b.referrer_ids)
+ and b.referrer_id=#{inviteId}
</if>
</where>
</select>
--
Gitblit v1.9.1