From 9fb1a68d11a8928f2ba602dd68dc00d19ca7429f Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 27 Feb 2024 15:47:57 +0800
Subject: [PATCH] 抽奖

---
 src/main/resources/mapper/modules/CjInfoMapper.xml                |   32 ++------------------------------
 src/main/java/cc/mrbird/febs/mall/service/impl/CJServiceImpl.java |    7 +++++++
 2 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/CJServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/CJServiceImpl.java
index f9c49e1..7813340 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/CJServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/CJServiceImpl.java
@@ -320,6 +320,13 @@
         IPage<CjInfo> page = new Page<>(kjRecordDto.getPageNum(), kjRecordDto.getPageSize());
         IPage<CjInfo> pages = cjInfoMapper.selectTzListByMemberId(page, kjRecordDto);
         List<CjInfo> records = pages.getRecords();
+        if(CollUtil.isNotEmpty(records)){
+            for(CjInfo item : records){
+                Long id = item.getId();
+                List<CjItem> cjItems = cjItemMapper.selectListByInfoId(id);
+                item.setItems(cjItems);
+            }
+        }
         List<ApiTzListVo> apiTzListVos = CjInfoConversion.INSTANCE.entitysToVos(records);
         return new FebsResponse().success().data(apiTzListVos);
     }
diff --git a/src/main/resources/mapper/modules/CjInfoMapper.xml b/src/main/resources/mapper/modules/CjInfoMapper.xml
index 2f06ad5..ad3f453 100644
--- a/src/main/resources/mapper/modules/CjInfoMapper.xml
+++ b/src/main/resources/mapper/modules/CjInfoMapper.xml
@@ -2,38 +2,10 @@
 <!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.CjInfoMapper">
 
-    <resultMap id="CjInfoMap" type="cc.mrbird.febs.mall.entity.CjInfo">
-        <id column="id" property="id" />
-        <result column="total_amount" property="totalAmount" />
-        <result column="kj_num" property="kjNum" />
-        <result column="kj_no" property="kjNo" />
-        <result column="kj_state" property="kjState" />
-        <result column="zj_state" property="zjState" />
-        <result column="perk_amount" property="perkAmount" />
-        <result column="CREATED_TIME" property="createdTime" />
-        <collection property="items" ofType="cc.mrbird.febs.mall.entity.CjItem">
-            <id column="item_id" property="id"  />
-            <result column="type"  property="type" />
-            <result column="amount" property="amount" />
-            <result column="item_kj_num" property="kjNum" />
-            <result column="item_num" property="itemNum"  />
-            <result column="item_perk_amount" property="perkAmount"  />
-            <result column="item_CREATED_TIME" property="createdTime"  />
-        </collection>
-    </resultMap>
-
-    <select id="selectTzListByMemberId" resultMap="CjInfoMap">
+    <select id="selectTzListByMemberId" resultType="cc.mrbird.febs.mall.entity.CjInfo">
         select
-        a.*,
-        b.id item_id,
-        b.type,
-        b.amount,
-        b.item_num,
-        b.kj_num item_kj_num,
-        b.CREATED_TIME item_CREATED_TIME,
-        b.perk_amount item_perk_amount
+        a.*
         from cj_info a
-        inner join cj_item b on a.id = b.info_id
         <where>
             <if test="record.memberId != null">
                 and a.member_id=#{record.memberId}

--
Gitblit v1.9.1