From 4ee42556139749bf6f29d47b912da0be6c37da2a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 15 May 2025 11:29:39 +0800
Subject: [PATCH] feat(mall): 添加商品 SKU静态属性价格字段
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 74 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 20 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 190092e..ae7ff75 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -57,10 +57,9 @@
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>
<if test="record != null">
<if test="record.payResult != null and record.payResult != ''">
@@ -109,6 +108,7 @@
<result column="member_id" property="memberId" />
<result column="order_time" property="orderTime" />
<result column="pay_time" property="payTime" />
+ <result column="score_amount" property="scoreAmount" />
<result column="amount" property="amount" />
<result column="pay_method" property="payMethod" />
<result column="pay_order_no" property="payOrderNo" />
@@ -128,6 +128,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" />
@@ -153,6 +154,8 @@
<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>
@@ -201,6 +204,8 @@
b.cnt,
b.price,
b.amount,
+ 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
@@ -212,7 +217,7 @@
a.status,
count(1) cnt
from mall_order_info a
- 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>
@@ -230,8 +235,12 @@
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 15 minute)
+ 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">
@@ -348,6 +357,7 @@
<result column="member_id" property="memberId" />
<result column="order_time" property="orderTime" />
<result column="pay_time" property="payTime" />
+ <result column="score_amount" property="scoreAmount" />
<result column="amount" property="amount" />
<result column="pay_method" property="payMethod" />
<result column="pay_order_no" property="payOrderNo" />
@@ -367,6 +377,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" />
@@ -379,12 +390,15 @@
<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">
@@ -414,6 +428,7 @@
select
a.*,
b.goods_name,
+ b.sku_name,
b.cnt,
b.price,
b.amount
@@ -424,19 +439,38 @@
</select>
<select id="getGoodsStatisticsInPage" resultType="cc.mrbird.febs.mall.vo.AdminGoodsStatisticsVo">
- select
- goods_name goodsName,
- SUM(cnt) goodsCnt
- from mall_order_item
- <where>
- <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
+ 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