From 5e121e6c9c2c7c04b85738a2d9bb81f13ea489ff Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 11 Sep 2023 18:09:15 +0800
Subject: [PATCH] 优惠卷
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 57 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index db7bf05..8cdf009 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -57,10 +57,9 @@
b.name memberName,
b.bind_phone memberBindPhone,
b.phone memberPhone,
- c.name leaderName
+ (select member.name from mall_member member where member.invite_id = b.referrer_id) refererName
from mall_order_info a
left join mall_member b on a.member_id = b.id
- left join mall_team_leader c on a.take_unique_code = c.unique_code
<where>
<if test="record != null">
<if test="record.payResult != null and record.payResult != ''">
@@ -153,6 +152,8 @@
<result property="price" column="price" />
<result property="amount" column="amount" />
<result property="isNormal" column="is_normal" />
+ <result property="memberInviteId" column="member_invite_id" />
+ <result property="memberCouponId" column="member_coupon_id" />
<result property="state" column="state" />
</collection>
</resultMap>
@@ -201,6 +202,8 @@
b.cnt,
b.price,
b.amount,
+ 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
@@ -231,7 +234,7 @@
</select>
<select id="selectOrderInfoUpTime" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
- select * from mall_order_info where status=#{status} and now() > date_add(order_time,interval 15 minute)
+ select * from mall_order_info where status=#{status} and now() > date_add(order_time,interval 1440 minute)
</select>
<select id="selectCntDirectOrTeam" resultType="java.lang.Integer">
@@ -414,29 +417,45 @@
select
a.*,
b.goods_name,
+ b.sku_name,
b.cnt,
b.price,
b.amount
from mall_order_info a
inner join mall_order_item b on a.id=b.order_id
- where a.del_flag=2 and a.id = #{orderId} and a.take_unique_code = #{takeUniqueCode}
+ where a.del_flag=2 and a.id = #{orderId}
order by a.created_time desc
</select>
<select id="getGoodsStatisticsInPage" resultType="cc.mrbird.febs.mall.vo.AdminGoodsStatisticsVo">
- select
- goods_name goodsName,
- SUM(cnt) goodsCnt
- from mall_order_item
- <where>
- <if test="record.orderIdsStr != null">
- and order_id in
- <foreach collection="record.orderIdsStr" item="id" index="index" open="(" close=")" separator=",">
- #{id}
- </foreach>
- </if>
- </where>
- GROUP BY goods_id
- ORDER BY goods_id desc
-</select>
+ select
+ goods_name goodsName,
+ SUM(cnt) goodsCnt
+ from mall_order_item
+ <where>
+ 1=1
+ <if test="record.orderIdsStr != null">
+ and order_id in
+ <foreach collection="record.orderIdsStr" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ </if>
+ </where>
+ GROUP BY goods_id
+ ORDER BY goods_id desc
+ </select>
+
+ <select id="selectAmountOrTeamAmount" resultType="java.math.BigDecimal">
+ 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)
+ <if test="type == 1">
+ and b.invite_id=#{inviteId}
+ </if>
+ <if test="type == 2">
+ and find_in_set(#{inviteId}, b.referrer_ids)
+ </if>
+ </where>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1