From cd9f7a2adbeb3dcc6060f6a5ea3a9d54dced5c64 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 16 May 2022 15:10:59 +0800
Subject: [PATCH] fix regiter
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 109 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 40fcccc..eca247a 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -6,6 +6,38 @@
select * from mall_order_info where member_id=#{memberId} and id=#{id}
</select>
+ <select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo">
+ select *,
+ b.name memberName,
+ b.bind_phone memberBindPhone,
+ b.phone memberPhone
+ from mall_order_info a
+ left join mall_member b on a.member_id = b.id
+ <where>
+ a.del_flag=2
+ <if test="record != null">
+ <if test="record.payResult != null and record.payResult != ''">
+ and a.pay_result = #{record.payResult}
+ </if>
+ <if test="record.status != null and record.status != ''">
+ and a.status = #{record.status}
+ </if>
+ <if test="record.orderNo != null and record.orderNo != ''">
+ and a.order_no like CONCAT('%', CONCAT(#{record.orderNo}, '%'))
+ </if>
+ <if test="record.name != null and record.name != ''">
+ and b.name like CONCAT('%', CONCAT(#{record.name}, '%'))
+ </if>
+ </if>
+ </where>
+ order by a.created_time desc
+ </select>
+
+ <select id="getMallOrderInfoById" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderVo">
+ select * from mall_order_info where id = #{id}
+ </select>
+
+
<resultMap id="OrderInfoMap" type="cc.mrbird.febs.mall.entity.MallOrderInfo">
<id column="id" property="id" />
<result column="order_no" property="orderNo" />
@@ -23,7 +55,9 @@
<result column="address" property="address" />
<result column="longitude" property="longitude" />
<result column="latitude" property="latitude" />
+ <result column="order_type" property="orderType" />
<result column="remark" property="remark" />
+ <result column="del_flag" property="delFlag" />
<collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
<id property="id" column="item_id" />
<result property="orderId" column="order_id" />
@@ -39,7 +73,7 @@
</collection>
</resultMap>
- <select id="selectOrderListInPage" resultMap="OrderInfoMap">
+ <select id="selectApiOrderListInPage" resultMap="OrderInfoMap">
select
a.*,
b.id item_id,
@@ -56,14 +90,24 @@
from mall_order_info a
inner join mall_order_item b on a.id=b.order_id
<where>
+ a.del_flag=2
<if test="record.query != null and record.query != ''">
and (b.goods_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.style_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.sku_name like CONCAT('%', CONCAT(#{record.query}, '%')))
</if>
- <if test="record.status == 4">
+ <if test="record.status == 4 and record.status != 0">
and a.status in (5,6)
</if>
- <if test="record.status != 4">
+ <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
+ </if>
+ <if test="record.memberId != null">
+ and a.member_id=#{record.memberId}
+ </if>
+ <if test="record.orderType != null">
+ and a.order_type=#{record.orderType}
</if>
</where>
order by a.created_time desc
@@ -85,6 +129,67 @@
b.amount
from mall_order_info a
inner join mall_order_item b on a.id=b.order_id
- where id=#{id}
+ where a.id=#{id}
+ </select>
+
+ <select id="selectMemberOrderStatusCnt" resultType="java.util.Map">
+ select
+ status,
+ count(1) cnt
+ from mall_order_info
+ where del_flag=2 and member_id=#{memberId}
+ group by status
+ </select>
+
+ <select id="getMallOrderDetailById" resultType="cc.mrbird.febs.mall.vo.AdminOrderDetailVo">
+ select * from mall_order_info a where a.id = #{id}
+ </select>
+
+ <select id="getMallOrderItemByOrderId" resultType="cc.mrbird.febs.mall.entity.MallOrderItem">
+ select * from mall_order_item where order_id = #{id}
+ </select>
+
+ <select id="selectOrderInfoByStatus" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
+ select * from mall_order_info where status=#{status}
+ </select>
+
+ <select id="selectCntDirectOrTeam" resultType="java.lang.Integer">
+ select IFNULL(count(1), 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.referrer_id=#{inviteId}
+ </if>
+ <if test="type == 2">
+ and find_in_set(#{inviteId}, b.referrer_ids)
+ </if>
+ </where>
+ </select>
+
+ <select id="selectCntDirect" resultType="java.lang.Integer">
+ select count(1) from (
+ select a.invite_id, count(1)
+ from mall_member a
+ inner join mall_order_info b on a.ID=b.member_id
+ where a.referrer_id=#{inviteId} and b.status in (2,3,4)
+ group by a.invite_id
+ ) a
+ </select>
+
+ <select id="selectTotalAmount" resultType="java.math.BigDecimal">
+ select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
+ where member_id=#{memberId} and status = 4
+ </select>
+
+ <select id="selectTotalAmountForDate" resultType="java.math.BigDecimal">
+ select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
+ where status = 4
+ <if test="member != null">
+ and member_id=#{memberId}
+ </if>
+ <if test="date != null">
+ and date_format(a.receving_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+ </if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1