From 413a57e2524cb0b839d5d83d961de3b59814eb6e Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 24 Oct 2025 16:53:11 +0800
Subject: [PATCH] feat(ai): 实现产品依赖解锁功能 - 在AiMemberAnswerServiceImpl中注入AiProductDependencyService和AiMemberProductUnlockService - 修改insure方法,根据答题分数解锁符合条件的产品 - 新增selectListByProductIds和insertList方法到AiMemberProductUnlockService - 实现产品依赖关系查询方法selectListByProductId到AiProductDependencyService- 在AiProductServiceImpl中增加产品状态判断逻辑,支持锁定和解锁状态显示 - 添加memberId字段到ApiProductPageDto用于查询用户已解锁产品 - 在ApiProductVo中新增state字段表示产品锁定/解锁状态

---
 src/main/resources/mapper/modules/MallOrderInfoMapper.xml |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 9799286..4a0eaa0 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>
 
@@ -443,9 +452,6 @@
             </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

--
Gitblit v1.9.1