From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 07 Jul 2025 17:51:09 +0800
Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类，添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑，增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑，移除冗余代码
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index e8975d1..539929e 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -127,6 +127,7 @@
<result column="take_code" property="takeCode" />
<result column="take_unique_code" property="takeUniqueCode" />
<result column="delivery_state" property="deliveryState" />
+ <result column="delivery_state" property="deliveryState" />
<result column="is_home" property="isHome" />
<result column="is_free" property="isFree" />
<result column="del_flag" property="delFlag" />
@@ -157,6 +158,9 @@
<result property="memberInviteId" column="member_invite_id" />
<result property="memberCouponId" column="member_coupon_id" />
<result property="state" column="state" />
+ <result property="itemScoreAmount" column="item_score_amount" />
+ <result property="itemAmount" column="item_amount" />
+ <result property="itemScorePrice" column="item_score_price" />
</collection>
</resultMap>
@@ -204,11 +208,16 @@
b.cnt,
b.price,
b.amount,
+ b.amount as item_amount ,
+ b.score_amount as item_score_amount ,
+ FLOOR((c.original_price * d.static_prop)/100) as item_score_price ,
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
+ left join mall_order_item b on a.id=b.order_id
+ left join mall_goods_sku c on c.id=b.sku_id
+ left join mall_goods d on d.id=b.goods_id
where a.id=#{id}
</select>
@@ -398,6 +407,7 @@
<result property="skuId" column="sku_id" />
<result property="goodsName" column="goods_name" />
<result property="itemScoreAmount" column="item_score_amount" />
+ <result property="itemAmount" column="item_amount" />
<result property="itemScorePrice" column="item_score_price" />
<result property="goodsName" column="goods_name" />
<result property="styleName" column="style_name" />
@@ -417,8 +427,9 @@
select
a.* ,
b.* ,
+ b.amount as item_amount ,
b.score_amount as item_score_amount ,
- FLOOR(b.original_price * d.static_prop) as item_score_price ,
+ FLOOR((c.original_price * d.static_prop)/100) as item_score_price ,
express.express_no
from mall_order_info a
left join mall_express_info express on a.id=express.order_id
--
Gitblit v1.9.1