diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletTaskAppController.java b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletTaskAppController.java index 8d085dd..0b71913 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletTaskAppController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletTaskAppController.java @@ -1,16 +1,18 @@ package com.playlet.web.controller.app; import com.github.pagehelper.PageInfo; +import com.playlet.common.annotation.Log; import com.playlet.common.core.controller.BaseController; +import com.playlet.common.core.domain.AjaxResult; import com.playlet.common.core.domain.Result; -import com.playlet.system.domain.PlayletItem; +import com.playlet.common.enums.BusinessType; import com.playlet.system.domain.PlayletTask; -import com.playlet.web.service.app.PlayletItemAppService; import com.playlet.web.service.app.PlayletTaskAppService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -64,5 +66,16 @@ public class PlayletTaskAppController extends BaseController { return Result.success(playletTaskAppService.selectPlayletTaskById(taskId)); } + /** + * 新增保存任务 + */ + @RequiresPermissions("system:task:add") + @Log(title = "用户任务新增", businessType = BusinessType.INSERT) + @PostMapping("/user/designate") + @ResponseBody + public AjaxResult addSave(PlayletTask playletTask) { + return toAjax(playletTaskAppService.userDesignateTask(playletTask)); + } + } diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletRevenueRecordAppService.java b/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletRevenueRecordAppService.java index 415c6a6..ffb6a78 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletRevenueRecordAppService.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletRevenueRecordAppService.java @@ -21,4 +21,6 @@ public interface PlayletRevenueRecordAppService { RevenueRecordStatisticsVO statistics(PlayletRevenueRecord record); List statisticsTimeType(PlayletRevenueRecord record); + + List searchByTaskId(Long taskId); } diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletTaskAppService.java b/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletTaskAppService.java index 24f1888..7ad3d16 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletTaskAppService.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletTaskAppService.java @@ -17,6 +17,13 @@ public interface PlayletTaskAppService { PageInfo getItemPageByUser(PlayletTask playletTask, Integer pageSize, Integer pageNum); + /** + * 用户选定任务 + * @param playletTask 任务实体数据 + * @return 是否添加成功 + */ + Boolean userDesignateTask(PlayletTask playletTask); + /** * 查询任务 * diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletUserTaskAppService.java b/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletUserTaskAppService.java index bea9437..8649a1f 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletUserTaskAppService.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletUserTaskAppService.java @@ -12,6 +12,14 @@ import java.util.List; */ public interface PlayletUserTaskAppService { + /** + * 根据用户id进行查询用户任务分发的奖金 + * + * @param taskId 用户id + * @return PlayletUserTask 任务用户集合 + */ + List searchByTaskIdList(Long taskId); + /** * 查询短剧用户任务 * diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletRevenueRecordAppServiceImpl.java b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletRevenueRecordAppServiceImpl.java index deca8f0..b44f265 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletRevenueRecordAppServiceImpl.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletRevenueRecordAppServiceImpl.java @@ -1,10 +1,12 @@ package com.playlet.web.service.app.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.playlet.system.domain.PlayletRevenueRecord; +import com.playlet.system.domain.PlayletUserTask; import com.playlet.system.pojo.vo.RevenueRecordStatisticsVO; import com.playlet.system.service.IPlayletRevenueRecordService; import com.playlet.web.service.app.PlayletRevenueRecordAppService; @@ -131,6 +133,11 @@ public class PlayletRevenueRecordAppServiceImpl implements PlayletRevenueRecordA return listByReturn; } + @Override + public List searchByTaskId(Long taskId) { + return revenueRecordService.searchByTaskId(taskId); + } + // 时间更新 private void timeSupplement(PlayletRevenueRecord record, Long startTime, Long endTime) { record.setStartTime(startTime); 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 cbbeb67..3060a2a 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 @@ -1,21 +1,22 @@ package com.playlet.web.service.app.impl; -import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.playlet.common.core.text.Convert; +import com.playlet.common.exception.ServiceException; import com.playlet.common.utils.DateUtils; -import com.playlet.system.domain.PlayletItem; -import com.playlet.system.domain.PlayletItemType; -import com.playlet.system.domain.PlayletRevenueRecord; -import com.playlet.system.domain.PlayletTask; -import com.playlet.system.mapper.PlayletTaskMapper; +import com.playlet.system.domain.*; +import com.playlet.system.service.IPlayletRevenueRecordService; +import com.playlet.system.service.IPlayletTaskService; import com.playlet.web.service.app.PlayletTaskAppService; +import com.playlet.web.service.app.PlayletUserTaskAppService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.DecimalFormat; import java.util.List; /** @@ -29,22 +30,47 @@ import java.util.List; @RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PlayletTaskAppServiceImpl implements PlayletTaskAppService { - private final PlayletTaskMapper playletTaskMapper; + private final IPlayletTaskService playletTaskService; + private final PlayletUserTaskAppService playletUserTaskAppService; + private final IPlayletRevenueRecordService revenueRecordService; @Override public PageInfo getItemPage(PlayletTask playletTask, Integer pageSize, Integer pageNum) { PageHelper.startPage(pageNum, pageSize); - List revenueRecordList = playletTaskMapper.selectPlayletTaskList(playletTask); + List revenueRecordList = playletTaskService.selectPlayletTaskList(playletTask); return PageInfo.of(revenueRecordList); } @Override public PageInfo getItemPageByUser(PlayletTask playletTask, Integer pageSize, Integer pageNum) { PageHelper.startPage(pageNum, pageSize); - List revenueRecordList = playletTaskMapper.selectPlayletTaskListByUser(playletTask); + List revenueRecordList = playletTaskService.selectPlayletTaskListByUser(playletTask); return PageInfo.of(revenueRecordList); } + @Override + public Boolean userDesignateTask(PlayletTask playletTask) { + // 检查任务数据。 + PlayletTask task = playletTaskService.selectPlayletTaskById(playletTask.getId()); + // 任务数据数据 + if (ObjectUtils.isNull(task)) { + throw new ServiceException("参与任务失败，未找到匹配任务数据。"); + } + // 任务状态 + if (task.getState() != 1) { + throw new ServiceException("参与任务失败，任务还未开始或者已结束。"); + } + // 是否在任务时间线内 + Long timeByNow = System.currentTimeMillis(); + if (task.getStartTime() >= timeByNow && timeByNow <= task.getEndTime()) { + // 用户数据绑定。 + playletUserTaskAppService.insertPlayletUserTask(PlayletUserTask.dataSupplement(task)); + return Boolean.TRUE; + } else { + throw new ServiceException("参与任务失败，任务未开始或者已结束。"); + } + } + /** * 查询任务 * @@ -53,7 +79,20 @@ public class PlayletTaskAppServiceImpl implements PlayletTaskAppService { */ @Override public PlayletTask selectPlayletTaskById(Long id) { - return playletTaskMapper.selectPlayletTaskById(id); + PlayletTask task = playletTaskService.selectPlayletTaskById(id); + if (ObjectUtils.isNotNull(task)) { + // 奖金划分数据查询 + List revenueRecordList = revenueRecordService.searchByTaskId(task.getId()); + if (CollectionUtils.isNotEmpty(revenueRecordList)) { + Long totalMoney = revenueRecordList.stream().mapToLong(PlayletRevenueRecord::getPracticalEarnings).sum(); + task.setBonusDividePercent(new DecimalFormat("#.0").format((totalMoney / task.getBonusDivideMoney() * 100)) + "%"); + task.setBonusDividePercent(totalMoney.toString()); + } else { + task.setBonusDividePercent("100%"); + task.setBonusDividePercent("0"); + } + } + return task; } /** @@ -64,7 +103,7 @@ public class PlayletTaskAppServiceImpl implements PlayletTaskAppService { */ @Override public List selectPlayletTaskList(PlayletTask playletTask) { - return playletTaskMapper.selectPlayletTaskList(playletTask); + return playletTaskService.selectPlayletTaskList(playletTask); } /** @@ -76,7 +115,7 @@ public class PlayletTaskAppServiceImpl implements PlayletTaskAppService { @Override public int insertPlayletTask(PlayletTask playletTask) { playletTask.setCreateTime(DateUtils.getNowDate()); - return playletTaskMapper.insertPlayletTask(playletTask); + return playletTaskService.insertPlayletTask(playletTask); } /** @@ -88,7 +127,7 @@ public class PlayletTaskAppServiceImpl implements PlayletTaskAppService { @Override public int updatePlayletTask(PlayletTask playletTask) { playletTask.setUpdateTime(DateUtils.getNowDate()); - return playletTaskMapper.updatePlayletTask(playletTask); + return playletTaskService.updatePlayletTask(playletTask); } /** @@ -99,7 +138,7 @@ public class PlayletTaskAppServiceImpl implements PlayletTaskAppService { */ @Override public int deletePlayletTaskByIds(String ids) { - return playletTaskMapper.deletePlayletTaskByIds(Convert.toStrArray(ids)); + return playletTaskService.deletePlayletTaskByIds(ids); } /** @@ -110,6 +149,6 @@ public class PlayletTaskAppServiceImpl implements PlayletTaskAppService { */ @Override public int deletePlayletTaskById(Long id) { - return playletTaskMapper.deletePlayletTaskById(id); + return playletTaskService.deletePlayletTaskById(id); } } diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserTaskAppServiceImpl.java b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserTaskAppServiceImpl.java index 5da3495..3c8e0fc 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserTaskAppServiceImpl.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserTaskAppServiceImpl.java @@ -1,10 +1,10 @@ package com.playlet.web.service.app.impl; -import com.playlet.common.core.text.Convert; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.playlet.common.utils.DateUtils; import com.playlet.system.domain.PlayletUserTask; -import com.playlet.system.mapper.PlayletUserTaskMapper; +import com.playlet.system.service.IPlayletUserTaskService; import com.playlet.web.service.app.PlayletUserTaskAppService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -24,7 +24,12 @@ import java.util.List; @RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PlayletUserTaskAppServiceImpl implements PlayletUserTaskAppService { - private final PlayletUserTaskMapper playletUserTaskMapper; + private final IPlayletUserTaskService service; + + @Override + public List searchByTaskIdList(Long taskId) { + return service.searchByTaskIdList(taskId); + } /** * 查询短剧用户任务 @@ -34,7 +39,7 @@ public class PlayletUserTaskAppServiceImpl implements PlayletUserTaskAppService */ @Override public PlayletUserTask selectPlayletUserTaskById(Long id) { - return playletUserTaskMapper.selectPlayletUserTaskById(id); + return service.selectPlayletUserTaskById(id); } /** @@ -45,7 +50,7 @@ public class PlayletUserTaskAppServiceImpl implements PlayletUserTaskAppService */ @Override public List selectPlayletUserTaskList(PlayletUserTask playletUserTask) { - return playletUserTaskMapper.selectPlayletUserTaskList(playletUserTask); + return service.selectPlayletUserTaskList(playletUserTask); } /** @@ -57,7 +62,7 @@ public class PlayletUserTaskAppServiceImpl implements PlayletUserTaskAppService @Override public int insertPlayletUserTask(PlayletUserTask playletUserTask) { playletUserTask.setCreateTime(DateUtils.getNowDate()); - return playletUserTaskMapper.insertPlayletUserTask(playletUserTask); + return service.insertPlayletUserTask(playletUserTask); } /** @@ -69,7 +74,7 @@ public class PlayletUserTaskAppServiceImpl implements PlayletUserTaskAppService @Override public int updatePlayletUserTask(PlayletUserTask playletUserTask) { playletUserTask.setUpdateTime(DateUtils.getNowDate()); - return playletUserTaskMapper.updatePlayletUserTask(playletUserTask); + return service.updatePlayletUserTask(playletUserTask); } /** @@ -80,7 +85,7 @@ public class PlayletUserTaskAppServiceImpl implements PlayletUserTaskAppService */ @Override public int deletePlayletUserTaskByIds(String ids) { - return playletUserTaskMapper.deletePlayletUserTaskByIds(Convert.toStrArray(ids)); + return service.deletePlayletUserTaskByIds(ids); } /** @@ -91,6 +96,6 @@ public class PlayletUserTaskAppServiceImpl implements PlayletUserTaskAppService */ @Override public int deletePlayletUserTaskById(Long id) { - return playletUserTaskMapper.deletePlayletUserTaskById(id); + return service.deletePlayletUserTaskById(id); } } diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletRevenueRecord.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletRevenueRecord.java index 9b7b8b2..3cdd0a2 100644 --- a/playlet-system/src/main/java/com/playlet/system/domain/PlayletRevenueRecord.java +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletRevenueRecord.java @@ -46,6 +46,13 @@ public class PlayletRevenueRecord extends BaseEntity { @ApiModelProperty(value = "剧场id") private Long playletItemId; + /** + * 任务Id + */ + @Excel(name = "任务id") + @ApiModelProperty(value = "任务id") + private Long taskId; + /** * 用户id */ diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletTask.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletTask.java index 40fd5cc..905ce7a 100644 --- a/playlet-system/src/main/java/com/playlet/system/domain/PlayletTask.java +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletTask.java @@ -115,6 +115,15 @@ public class PlayletTask extends BaseEntity { @TableField(exist = false) @Excel(name = "用户id") @ApiModelProperty(value = "用户id") - private Long userId; + private String userId; + @TableField(exist = false) + @Excel(name = "奖金划分 百分比 保留一位小数") + @ApiModelProperty(value = "奖金划分 百分比 保留一位小数") + private String bonusDividePercent; + + @TableField(exist = false) + @Excel(name = "奖金划分 金额 单位分") + @ApiModelProperty(value = "奖金划分 金额 单位分") + private Long bonusDivideMoney; } diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletUserTask.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletUserTask.java index 0775227..b43030f 100644 --- a/playlet-system/src/main/java/com/playlet/system/domain/PlayletUserTask.java +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletUserTask.java @@ -7,6 +7,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import com.playlet.common.annotation.Excel; +import java.util.Date; + /** * @Date: 2024-03-22 11:56 * @Author: 但星霖 @@ -38,14 +40,14 @@ public class PlayletUserTask extends BaseEntity { */ @ApiModelProperty(value = "用户Id") @Excel(name = "用户Id") - private Long userId; + private String userId; /** * 用户任务状态 */ - @ApiModelProperty(value = "用户任务状态") - @Excel(name = "用户任务状态") - private Long userTasklState; + @ApiModelProperty(value = "用户任务状态 0 未开始 1 已开始 2 已结束 3 已失效 4 已完成") + @Excel(name = "用户任务状态 0 未开始 1 已开始 2 已结束 3 已失效 4 已完成") + private Integer userTaskState; /** * 任务开始时间 @@ -61,4 +63,17 @@ public class PlayletUserTask extends BaseEntity { @Excel(name = "任务结束时间") private Long taskEndTime; + public static PlayletUserTask dataSupplement(PlayletTask task){ + PlayletUserTask userTask = new PlayletUserTask(); + userTask.setTaskId(task.getId()); + userTask.setUserId(task.getUserId()); + userTask.setUserTaskState(1); + userTask.setCreateBy(task.getUserId()); + userTask.setUpdateBy(task.getUserId()); + userTask.setTaskEndTime(task.getStartTime()); + userTask.setTaskEndTime(task.getEndTime()); + userTask.setCreateTime(new Date()); + userTask.setUpdateTime(new Date()); + return userTask; + } } diff --git a/playlet-system/src/main/java/com/playlet/system/service/IPlayletRevenueRecordService.java b/playlet-system/src/main/java/com/playlet/system/service/IPlayletRevenueRecordService.java index ee97554..b93a016 100644 --- a/playlet-system/src/main/java/com/playlet/system/service/IPlayletRevenueRecordService.java +++ b/playlet-system/src/main/java/com/playlet/system/service/IPlayletRevenueRecordService.java @@ -67,4 +67,6 @@ public interface IPlayletRevenueRecordService extends IService statisticsTimeType(PlayletRevenueRecord record); + + List searchByTaskId(Long taskId); } diff --git a/playlet-system/src/main/java/com/playlet/system/service/IPlayletTaskService.java b/playlet-system/src/main/java/com/playlet/system/service/IPlayletTaskService.java index 0621c9d..2660eee 100644 --- a/playlet-system/src/main/java/com/playlet/system/service/IPlayletTaskService.java +++ b/playlet-system/src/main/java/com/playlet/system/service/IPlayletTaskService.java @@ -59,4 +59,6 @@ public interface IPlayletTaskService extends IService { * @return 结果 */ public int deletePlayletTaskById(Long id); + + List selectPlayletTaskListByUser(PlayletTask playletTask); } diff --git a/playlet-system/src/main/java/com/playlet/system/service/IPlayletUserTaskService.java b/playlet-system/src/main/java/com/playlet/system/service/IPlayletUserTaskService.java index 4a3ece9..8a19bba 100644 --- a/playlet-system/src/main/java/com/playlet/system/service/IPlayletUserTaskService.java +++ b/playlet-system/src/main/java/com/playlet/system/service/IPlayletUserTaskService.java @@ -12,6 +12,14 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IPlayletUserTaskService extends IService { + /** + * 根据用户id进行查询用户任务分发的奖金 + * + * @param taskId 用户id + * @return PlayletUserTask 任务用户集合 + */ + List searchByTaskIdList(Long taskId); + /** * 查询短剧用户任务 * diff --git a/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletRevenueRecordServiceImpl.java b/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletRevenueRecordServiceImpl.java index 40f2535..db5be40 100644 --- a/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletRevenueRecordServiceImpl.java +++ b/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletRevenueRecordServiceImpl.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.github.pagehelper.PageHelper; @@ -195,6 +196,14 @@ public class PlayletRevenueRecordServiceImpl extends ServiceImpl searchByTaskId(Long taskId) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.lambda().select() + .eq(PlayletRevenueRecord::getTaskId, taskId); + return playletRevenueRecordMapper.selectList(wrapper); + } + // 时间更新 private void timeSupplement(PlayletRevenueRecord record, Long startTime, Long endTime) { record.setStartTime(startTime); diff --git a/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletTaskServiceImpl.java b/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletTaskServiceImpl.java index d46dddf..1f794ad 100644 --- a/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletTaskServiceImpl.java +++ b/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletTaskServiceImpl.java @@ -91,4 +91,9 @@ public class PlayletTaskServiceImpl extends ServiceImpl selectPlayletTaskListByUser(PlayletTask playletTask) { + return playletTaskMapper.selectPlayletTaskListByUser(playletTask); + } } diff --git a/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletUserTaskServiceImpl.java b/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletUserTaskServiceImpl.java index a8d40e7..c46fa45 100644 --- a/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletUserTaskServiceImpl.java +++ b/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletUserTaskServiceImpl.java @@ -2,6 +2,7 @@ package com.playlet.system.service.impl; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.playlet.common.utils.DateUtils; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; @@ -24,6 +25,15 @@ public class PlayletUserTaskServiceImpl extends ServiceImpl searchByTaskIdList(Long taskId) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.lambda().select() + .eq(PlayletUserTask::getTaskId, taskId) + .eq(PlayletUserTask::getUserTaskState, 4); + return playletUserTaskMapper.selectList(wrapper); + } + /** * 查询短剧用户任务 * diff --git a/playlet-system/src/main/resources/mapper/system/PlayletRevenueRecordMapper.xml b/playlet-system/src/main/resources/mapper/system/PlayletRevenueRecordMapper.xml index d53df23..5d297bf 100644 --- a/playlet-system/src/main/resources/mapper/system/PlayletRevenueRecordMapper.xml +++ b/playlet-system/src/main/resources/mapper/system/PlayletRevenueRecordMapper.xml @@ -26,7 +26,7 @@ - select id, refund_money, playlet_item_id, user_id, source_platform, earnings_type, clicks_number, clicks_number_people, recharge_money, estimate_earnings, practical_earnings, push_time, create_by, create_time, update_by, update_time, remark, item_type from playlet_revenue_record + select id, refund_money, playlet_item_id, user_id, source_platform, earnings_type, clicks_number, clicks_number_people, recharge_money, estimate_earnings, practical_earnings, push_time, create_by, create_time, update_by, update_time, remark, item_type, task_id from playlet_revenue_record