From 535c81a311bcd54b7ef5aa3f02b3cddc19b854d1 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 15 May 2025 16:06:14 +0800
Subject: [PATCH] feat(mall): 新增订单项的积分金额和积分价格字段- 在 MallOrderInfoMapper.xml 中添加了 item_score_amount 和 item_score_price 字段的映射 - 在 MallOrderItem 实体类中添加了 itemScorePrice 字段 - 更新了 selectNewApiOrderListInPage 查询,加入了积分金额和积分价格的计算

---
 src/main/resources/mapper/modules/HappyActivityMapper.xml |   41 +++++------------------------------------
 1 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/src/main/resources/mapper/modules/HappyActivityMapper.xml b/src/main/resources/mapper/modules/HappyActivityMapper.xml
index 90a0a01..e333c60 100644
--- a/src/main/resources/mapper/modules/HappyActivityMapper.xml
+++ b/src/main/resources/mapper/modules/HappyActivityMapper.xml
@@ -1,44 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cc.mrbird.febs.mall.mapper.HappyActivityMapper">
+<mapper namespace="cc.mrbird.febs.mall.mapper.HappyActivityConnectMapper">
 
-    <select id="selectActivityPage" resultType="cc.mrbird.febs.mall.vo.api.activity.ApiActivityInfoVo">
+    <select id="selectConnectListPage" resultType="cc.mrbird.febs.mall.vo.ApiConnectListInPageVo">
         select
-            a.id,
-            a.index_img,
-            a.code,
-            a.name,
-            a.state,
-            a.join_cnt,
-            a.start_time,
-            a.end_time
-        from happy_activity a
-        <where>
-            a.state != 0
-            and a.DELETE_FLAG = 0
-            <if test="record != null">
-                <if test="record.query != null and record.query != ''">
-                    and a.name like CONCAT('%', CONCAT(#{record.query}, '%'))
-                </if>
-                <if test="record.hotState != null">
-                    and a.hot_state=#{record.hotState}
-                </if>
-                <if test="record.categoryId != null">
-                    and a.category_id=#{record.categoryId}
-                </if>
-            </if>
-        </where>
-        order by a.order_cnt asc, a.id desc
-    </select>
-
-    <select id="getVoteRecordInPage" resultType="cc.mrbird.febs.mall.vo.api.activity.options.ApiVoteRecordInPageVo">
-        select
-            a.member_id as memberId,
-                a.created_time as createdTime
-        from happy_follow a
+            a.*
+        from happy_activity_connect a
         where
-            a.type = 4
-            and a.source_option_id = #{record.sourceOptionId}
+            a.member_id = #{record.memberId}
         order by a.id desc
     </select>
 

--
Gitblit v1.9.1