From 8bf923b44bbe9b45b73ddcc25df75c9c59f54e07 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:19:44 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 101 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index aa3e5b0..bb3975c 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -44,15 +44,19 @@
</select>
<select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo">
- select *,
+ select a.*,
b.name memberName,
b.bind_phone memberBindPhone,
- b.phone memberPhone
- from mall_order_info a
+ b.phone memberPhone,
+ c.goods_name
+ from mall_order_item c
+ left join mall_order_info a on a.id = c.order_id
left join mall_member b on a.member_id = b.id
<where>
- a.del_flag=2
<if test="record != null">
+ <if test="record.goodsName != null and record.goodsName != ''">
+ and c.goods_name like CONCAT('%', CONCAT(#{record.goodsName}, '%'))
+ </if>
<if test="record.payResult != null and record.payResult != ''">
and a.pay_result = #{record.payResult}
</if>
@@ -67,6 +71,12 @@
</if>
<if test="record.name != null and record.name != ''">
and b.name like CONCAT('%', CONCAT(#{record.name}, '%'))
+ </if>
+ <if test="record.startTime != null and record.startTime != ''">
+ and a.order_time >= #{record.startTime}
+ </if>
+ <if test="record.endTime != null and record.endTime != ''">
+ and a.order_time <= #{record.endTime}
</if>
</if>
</where>
@@ -96,8 +106,14 @@
<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="del_flag" property="delFlag" />
+ <result column="deliver_type" property="deliverType" />
+ <result column="shop_id" property="shopId" />
+ <result column="score_amount" property="scoreAmount" />
+ <result column="score_cnt" property="scoreCnt" />
<collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
<id property="id" column="item_id" />
<result property="orderId" column="order_id" />
@@ -110,6 +126,11 @@
<result property="cnt" column="cnt" />
<result property="price" column="price" />
<result property="amount" column="amount" />
+ <result property="isNormal" column="is_normal" />
+ <result property="staticMulti" column="static_multi" />
+ <result property="goodsLevel" column="goods_level" />
+ <result property="normalPer" column="normal_per" />
+ <result property="normalBonus" column="normal_bonus" />
</collection>
</resultMap>
@@ -135,7 +156,7 @@
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 and record.status != 0">
- and a.status in (5,6)
+ and a.status = 4
</if>
<if test="record.status != 4 and record.status != 0 and record.status != 5">
and a.status = #{record.status}
@@ -166,7 +187,12 @@
b.sku_image,
b.cnt,
b.price,
- b.amount
+ b.amount,
+ b.is_normal,
+ b.static_multi,
+ b.goods_level,
+ b.normal_per,
+ b.normal_bonus
from mall_order_info a
inner join mall_order_item b on a.id=b.order_id
where a.id=#{id}
@@ -219,7 +245,7 @@
<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
+ where member_id=#{memberId} and status in (2, 3, 4) and order_type=1
</select>
<select id="selectTotalAmountForDate" resultType="java.math.BigDecimal">
@@ -229,11 +255,78 @@
and member_id=#{memberId}
</if>
<if test="date != null">
- and date_format(a.receving_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+ and date_format(a.receiving_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+ </if>
+ </select>
+
+ <select id="selectTotalAmountUnCostForDate" resultType="java.math.BigDecimal">
+ select IFNULL(sum(IFNULL(b.amount,0) - IFNULL(b.cost_price*b.cnt, 0)),0)
+ from mall_order_info a
+ inner join mall_order_item b on a.id=b.order_id
+ where a.order_type=1
+ <if test="isNormal == 2">
+ and a.status in (2, 3, 4) and b.is_normal = 2 and b.has_settle=1
+ </if>
+ <if test="isNormal == 1">
+ and a.status=4 and b.is_normal = 1 and b.has_settle=1
+ </if>
+ <if test="member != null">
+ and member_id=#{memberId}
+ </if>
+ <if test='date != null and dateType == "D"'>
+ and date_format(a.pay_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+ </if>
+ <if test='date != null and dateType == "M"'>
+ and date_format(a.pay_time, '%Y-%m') = date_format(#{date}, '%Y-%m')
+ </if>
+ <if test='date != null and dateType == "Y"'>
+ and date_format(a.pay_time, '%Y') = date_format(#{date}, '%Y')
</if>
</select>
<select id="selectByOrderNo" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
select * from mall_order_info where order_no=#{orderNo}
</select>
+
+ <update id="updateOrderConfirmStatus">
+ update mall_order_info
+ set status=4,
+ receiving_time=now()
+ where status=3 and date_format(pay_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+ </update>
+
+ <select id="selectOrderInfoWithNormalGoods" resultMap="OrderInfoMap">
+ select * from mall_order_info a
+ inner join mall_order_item b on a.id=b.order_id and b.is_normal=1
+ where date_format(pay_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+ </select>
+
+ <select id="selectSumAmountByPayMethodAndStatue" resultType="java.math.BigDecimal">
+ select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
+ where pay_method = #{payMethod} and status = #{statue}
+ </select>
+
+ <select id="selectTotalAmountByPayDoneAndDataString" resultType="java.math.BigDecimal">
+ select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
+ where pay_result = #{payResult} and date_format(pay_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+ </select>
+
+ <select id="selectSumAmountByPayMethodAndSomeStatue" resultType="java.math.BigDecimal">
+ select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
+ where pay_method = #{payMethod}
+ and status in
+ <foreach collection="statues" separator="," close=")" open="(" item="item">
+ #{item}
+ </foreach>
+ </select>
+
+ <select id="selectScoreOrderListInDate" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
+ select * from mall_order_info orderInfo
+ inner join mall_order_item orderItem on orderInfo.id=orderItem.order_id
+ inner join mall_goods goodsInfo on orderItem.goods_id=goodsInfo.ID and goodsInfo.goods_type = 2 and goodsInfo.id=#{goodsId}
+ where orderInfo.order_time >= #{startDate}
+ and orderInfo.order_time <= #{endDate}
+ and orderInfo.status in (2,3,4,5)
+ and orderInfo.member_id=#{memberId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1