From 2a9a77e021c16037220c2c29ca116a69e352bdcc Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 25 Jan 2024 10:20:25 +0800
Subject: [PATCH] 发票
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 660351c..fb2e09e 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -44,15 +44,20 @@
</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.account_login accountLogin,
+ 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 +72,15 @@
</if>
<if test="record.name != null and record.name != ''">
and b.name like CONCAT('%', CONCAT(#{record.name}, '%'))
+ </if>
+ <if test="record.accountLogin != null and record.accountLogin != ''">
+ and b.account_login like CONCAT('%', CONCAT(#{record.accountLogin}, '%'))
+ </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>
@@ -100,6 +114,10 @@
<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" />
@@ -269,7 +287,7 @@
<update id="updateOrderConfirmStatus">
update mall_order_info
set status=4,
- receiving_time=new Date()
+ receiving_time=now()
where status=3 and date_format(pay_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
</update>
@@ -283,4 +301,18 @@
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>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1