From e0c1ebaa6a9bf2acd2bd32286fe488761e886ee2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Sep 2022 15:34:09 +0800
Subject: [PATCH] 20220902
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 176 +++++++++++++++++++++++++++-------------------------------
1 files changed, 83 insertions(+), 93 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index c71e5e5..9babf59 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -71,7 +71,6 @@
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>
- a.del_flag=2
<if test="record != null">
<if test="record.payResult != null and record.payResult != ''">
and a.pay_result = #{record.payResult}
@@ -167,103 +166,17 @@
</collection>
</resultMap>
-
- <resultMap id="NewOrderInfoMap" type="cc.mrbird.febs.mall.entity.MallOrderInfo">
- <id column="id" property="id" />
- <result column="order_no" property="orderNo" />
- <result column="member_id" property="memberId" />
- <result column="order_time" property="orderTime" />
- <result column="pay_time" property="payTime" />
- <result column="amount" property="amount" />
- <result column="pay_method" property="payMethod" />
- <result column="pay_order_no" property="payOrderNo" />
- <result column="pay_result" property="payResult" />
- <result column="status" property="status" />
- <result column="cancel_type" property="cancelType" />
- <result column="name" property="name" />
- <result column="phone" property="phone" />
- <result column="address" property="address" />
- <result column="longitude" property="longitude" />
- <result column="latitude" property="latitude" />
- <result column="order_type" property="orderType" />
- <result column="comment_state" property="commentState" />
- <result column="carriage" property="carriage" />
- <result column="remark" property="remark" />
- <result column="take_code" property="takeCode" />
- <result column="take_unique_code" property="takeUniqueCode" />
- <result column="delivery_state" property="deliveryState" />
- <result column="is_home" property="isHome" />
- <result column="del_flag" property="delFlag" />
- <result column="leader_name" property="leaderName" />
- <result column="leader_phone" property="leaderPhone" />
- <result column="address_pic" property="addressPic" />
- <result column="address_area" property="addressArea" />
- <result column="province" property="province" />
- <result column="leaderLongitude" property="leaderLongitude" />
- <result column="leaderLatitude" property="leaderLatitude" />
- <result column="province" property="province" />
- <result column="city" property="city" />
- <result column="township" property="township" />
- <result column="detail_address" property="detailAddress" />
- </resultMap>
-
- <select id="selectNewApiOrderListInPage" resultMap="NewOrderInfoMap">
+ <select id="selectApiOrderListInPage" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
select
a.*,
- c.name leader_name,
- c.phone leader_phone,
- c.address_pic,
- c.address_area,
+ c.name leaderName,
+ c.phone leaderPhone,
+ c.address_pic addressPic,
+ c.address_area addressArea,
c.province,
c.city,
c.township,
- c.detail_address
- from mall_order_info a
- inner join mall_team_leader c on a.take_unique_code=c.unique_code
- <where>
- a.del_flag=2
- <if test="record.memberId != null">
- and a.member_id=#{record.memberId}
- </if>
- <if test="record.status == 4 and record.status != 0">
- and a.status = 4
- </if>
- <if test="record.status != 4 and record.status != 0 and record.status != 5">
- and a.status = #{record.status}
- </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
- </select>
-
- <select id="selectApiOrderListInPage" resultMap="OrderInfoMap">
- select
- a.*,
- b.id item_id,
- b.order_id,
- b.goods_id,
- b.sku_id,
- b.goods_name,
- b.style_name,
- b.sku_name,
- b.sku_image,
- b.state,
- b.cnt,
- b.price,
- b.amount,
- c.name leader_name,
- c.phone leader_phone,
- c.address_pic,
- c.address_area,
- c.province,
- c.city,
- c.township,
- c.detail_address
+ c.detail_address detailAddress
from mall_order_info a
inner join mall_order_item b on a.id=b.order_id
inner join mall_team_leader c on a.take_unique_code=c.unique_code
@@ -343,6 +256,10 @@
<select id="selectOrderInfoByStatus" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
select * from mall_order_info where status=#{status}
+ </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>
<select id="selectCntDirectOrTeam" resultType="java.lang.Integer">
@@ -452,4 +369,77 @@
select * from mall_order_info where status=#{status}
and date_format(pay_time, '%Y-%m-%d') = date_format(#{paytime}, '%Y-%m-%d')
</select>
+
+ <resultMap id="NewOrderInfoMap" type="cc.mrbird.febs.mall.entity.MallOrderInfo">
+ <id column="id" property="id" />
+ <result column="order_no" property="orderNo" />
+ <result column="member_id" property="memberId" />
+ <result column="order_time" property="orderTime" />
+ <result column="pay_time" property="payTime" />
+ <result column="amount" property="amount" />
+ <result column="pay_method" property="payMethod" />
+ <result column="pay_order_no" property="payOrderNo" />
+ <result column="pay_result" property="payResult" />
+ <result column="status" property="status" />
+ <result column="cancel_type" property="cancelType" />
+ <result column="name" property="name" />
+ <result column="phone" property="phone" />
+ <result column="address" property="address" />
+ <result column="longitude" property="longitude" />
+ <result column="latitude" property="latitude" />
+ <result column="order_type" property="orderType" />
+ <result column="comment_state" property="commentState" />
+ <result column="carriage" property="carriage" />
+ <result column="remark" property="remark" />
+ <result column="take_code" property="takeCode" />
+ <result column="take_unique_code" property="takeUniqueCode" />
+ <result column="delivery_state" property="deliveryState" />
+ <result column="is_home" property="isHome" />
+ <result column="del_flag" property="delFlag" />
+ <result column="leader_name" property="leaderName" />
+ <result column="leader_phone" property="leaderPhone" />
+ <result column="address_pic" property="addressPic" />
+ <result column="address_area" property="addressArea" />
+ <result column="province" property="province" />
+ <result column="leaderLongitude" property="leaderLongitude" />
+ <result column="leaderLatitude" property="leaderLatitude" />
+ <result column="province" property="province" />
+ <result column="city" property="city" />
+ <result column="township" property="township" />
+ <result column="detail_address" property="detailAddress" />
+ </resultMap>
+
+ <select id="selectNewApiOrderListInPage" resultMap="NewOrderInfoMap">
+ select
+ a.*,
+ c.name leader_name,
+ c.phone leader_phone,
+ c.address_pic,
+ c.address_area,
+ c.province,
+ c.city,
+ c.township,
+ c.detail_address
+ from mall_order_info a
+ inner join mall_team_leader c on a.take_unique_code=c.unique_code
+ <where>
+ a.del_flag=2
+ <if test="record.memberId != null">
+ and a.member_id=#{record.memberId}
+ </if>
+ <if test="record.status == 4 and record.status != 0">
+ and a.status = 4
+ </if>
+ <if test="record.status != 4 and record.status != 0 and record.status != 5">
+ and a.status = #{record.status}
+ </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
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1