From 529ad9dd8d1876b57e852bc45b602ba3ccc8df2a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 10 Apr 2024 17:19:08 +0800
Subject: [PATCH] 公告-首页公告调整
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 271 +++++++++++++++++++++++++++++-------------------------
1 files changed, 145 insertions(+), 126 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index c71e5e5..9e7f9e6 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -15,18 +15,9 @@
b.sku_image,
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
+ b.amount
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
<where>
a.del_flag=2
<if test="record.status == 4 and record.status != 0">
@@ -66,12 +57,10 @@
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
+ inner 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}
@@ -138,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" />
@@ -163,110 +153,17 @@
<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>
-
- <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.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
+ a.*
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
<where>
a.del_flag=2
<if test="record.memberId != null">
@@ -306,20 +203,11 @@
b.cnt,
b.price,
b.amount,
- b.is_normal,
- c.name leader_name,
- c.phone leader_phone,
- c.address_pic,
- c.address_area,
- c.province,
- c.city,
- c.township,
- c.longitude leaderLongitude,
- c.latitude leaderLatitude,
- c.detail_address
+ 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
- inner join mall_team_leader c on a.take_unique_code=c.unique_code
where a.id=#{id}
</select>
@@ -328,13 +216,14 @@
a.status,
count(1) cnt
from mall_order_info a
- inner join mall_team_leader c on a.take_unique_code=c.unique_code
- 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>
<select id="getMallOrderDetailById" resultType="cc.mrbird.febs.mall.vo.AdminOrderDetailVo">
- select * from mall_order_info a where a.id = #{id}
+ select a.*,b.area addressArea,b.address addressInfo from mall_order_info a
+ left join mall_address_info b on a.address_id = b.id
+ where a.id = #{id}
</select>
<select id="getMallOrderItemByOrderId" resultType="cc.mrbird.febs.mall.entity.MallOrderItem">
@@ -343,6 +232,14 @@
<select id="selectOrderInfoByStatus" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
select * from mall_order_info where status=#{status}
+ </select>
+
+ <select id="selectOrderInfoByStatusAndIsInvoice" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
+ select * from mall_order_info where status = #{status} and is_invoice = #{isInvoice}
+ </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 1440 minute)
</select>
<select id="selectCntDirectOrTeam" resultType="java.lang.Integer">
@@ -452,4 +349,126 @@
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="is_free" property="isFree" />
+ <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" />
+ <result column="express_no" property="expressNo" />
+ </resultMap>
+
+ <select id="selectNewApiOrderListInPage" resultMap="NewOrderInfoMap">
+ select
+ a.*
+ ,express.express_no
+ from mall_order_info a
+ left join mall_express_info express on a.id=express.order_id
+ <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="selectByIdAndTakeUniqueCode" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
+ select * from mall_order_info where id = #{orderId} and take_unique_code = #{takeUniqueCode}
+ </select>
+
+ <select id="selectAllOrderInfoByIdAndTakeUniqueCode" resultMap="OrderInfoMap">
+ 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}
+ 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>
+ 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>
+
+ <select id="selectBypayOrderNo" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
+ select * from mall_order_info where pay_order_no = #{payOrderNo}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1