From 21d55dbb470ee4bba6f5b521106931959622f1da Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Mon, 13 May 2024 16:09:01 +0800 Subject: [PATCH] =?UTF-8?q?APP=E9=A1=B5=E9=9D=A2=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/impl/PlayletTaskAppServiceImpl.java | 14 ++++++++++++++ .../resources/mapper/system/PlayletTaskMapper.xml | 5 ----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletTaskAppServiceImpl.java b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletTaskAppServiceImpl.java index 2a7ea60..019f518 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletTaskAppServiceImpl.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletTaskAppServiceImpl.java @@ -8,6 +8,7 @@ import com.github.pagehelper.PageInfo; import com.playlet.common.exception.ServiceException; import com.playlet.common.utils.DateUtils; import com.playlet.system.domain.*; +import com.playlet.system.service.IPlayletItemService; import com.playlet.system.service.IPlayletRevenueRecordService; import com.playlet.system.service.IPlayletTaskService; import com.playlet.system.service.IPlayletUserTaskService; @@ -37,11 +38,18 @@ public class PlayletTaskAppServiceImpl implements PlayletTaskAppService { private final IPlayletUserTaskService iPlayletUserTaskService; private final PlayletUserTaskAppService playletUserTaskAppService; private final IPlayletRevenueRecordService revenueRecordService; + private final IPlayletItemService playletItemService; @Override public PageInfo getTaskPage(PlayletTask playletTask, Integer pageNum, Integer pageSize) { PageHelper.startPage(pageNum, pageSize); List revenueRecordList = playletTaskService.selectPlayletTaskList(playletTask); + revenueRecordList.forEach(model->{ + PlayletItem playletItem = playletItemService.getById(model.getItemId()); + if(playletItem != null){ + model.setPlayletItem(playletItem); + } + }); return PageInfo.of(revenueRecordList); } @@ -49,6 +57,12 @@ public class PlayletTaskAppServiceImpl implements PlayletTaskAppService { public PageInfo getTaskPageByUser(PlayletTask playletTask, Integer pageNum, Integer pageSize) { PageHelper.startPage(pageNum, pageSize); List revenueRecordList = playletTaskService.selectPlayletTaskListByUser(playletTask); + revenueRecordList.forEach(model->{ + PlayletItem playletItem = playletItemService.getById(model.getItemId()); + if(playletItem != null){ + model.setPlayletItem(playletItem); + } + }); return PageInfo.of(revenueRecordList); } diff --git a/playlet-system/src/main/resources/mapper/system/PlayletTaskMapper.xml b/playlet-system/src/main/resources/mapper/system/PlayletTaskMapper.xml index b670dec..b63d5ce 100644 --- a/playlet-system/src/main/resources/mapper/system/PlayletTaskMapper.xml +++ b/playlet-system/src/main/resources/mapper/system/PlayletTaskMapper.xml @@ -117,12 +117,7 @@ and playlet_task.`start_time` = #{startTime} and playlet_task.`end_time` = #{endTime} and playlet_task.`platform_type` = #{platformType} - and playlet_task.`rule` = #{rule} - and playlet_task.`contribute_start_time` = #{contributeStartTime} - and playlet_task.`contribute_end_time` = #{contributeEndTime} - and playlet_task.`ask_for` = #{askFor} and playlet_task.`total_bonus` = #{totalBonus} - and playlet_task.`award_describe` = #{awardDescribe} and playlet_task.`state` = #{state}