From 93dd377310eeec4389c6a0f786dd498bdb28cffc Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 27 Jul 2023 16:19:29 +0800
Subject: [PATCH] 赠送积分更新状态
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index db7bf05..deecbca 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -56,11 +56,9 @@
select a.*,
b.name memberName,
b.bind_phone memberBindPhone,
- b.phone memberPhone,
- c.name leaderName
+ b.phone memberPhone
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 != ''">
@@ -140,6 +138,7 @@
<result column="city" property="city" />
<result column="township" property="township" />
<result column="detail_address" property="detailAddress" />
+ <result column="delivery_type" property="deliveryType" />
<collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
<id property="id" column="item_id" />
<result property="orderId" column="order_id" />
@@ -231,7 +230,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,12 +413,13 @@
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>
@@ -429,6 +429,7 @@
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=",">
--
Gitblit v1.9.1