From 00f4e17324f81d07a42d3356e323f29493a1504e Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Mon, 25 Mar 2024 14:08:29 +0800 Subject: [PATCH] fix bug --- .../app/PlayletRevenueRecordAppController.java | 2 +- .../impl/PlayletRevenueRecordAppServiceImpl.java | 10 +++++----- playlet-admin/src/main/resources/application.yml | 2 ++ .../system/domain/PlayletRevenueRecord.java | 8 +++++--- .../impl/PlayletRevenueRecordServiceImpl.java | 15 ++++++--------- .../mapper/system/PlayletRevenueRecordMapper.xml | 9 ++++----- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletRevenueRecordAppController.java b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletRevenueRecordAppController.java index d267679..b6b58b5 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletRevenueRecordAppController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletRevenueRecordAppController.java @@ -40,7 +40,7 @@ public class PlayletRevenueRecordAppController extends BaseController { public Result> recordList(@RequestBody PlayletRevenueRecord playletRevenueRecord, @RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize") Integer pageSize) { - return Result.success(service.getItemPage(playletRevenueRecord, pageSize, pageNum)); + return Result.success(service.getItemPage(playletRevenueRecord, pageNum, pageSize)); } @ResponseBody 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 b44f265..c3a227a 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 @@ -71,8 +71,8 @@ public class PlayletRevenueRecordAppServiceImpl implements PlayletRevenueRecordA vo.setTotalMoney(revenueRecordListByTotal.stream().mapToLong(PlayletRevenueRecord::getPracticalEarnings).sum()); } // 开始时间结束时间缺省值 - Long startTime = System.currentTimeMillis(); - Long endTime = System.currentTimeMillis(); + Date startTime = null; + Date endTime = record.getStartTime(); // 今日 startTime = timeGain(null); timeSupplement(record, startTime, endTime); @@ -139,13 +139,13 @@ public class PlayletRevenueRecordAppServiceImpl implements PlayletRevenueRecordA } // 时间更新 - private void timeSupplement(PlayletRevenueRecord record, Long startTime, Long endTime) { + private void timeSupplement(PlayletRevenueRecord record, Date startTime, Date endTime) { record.setStartTime(startTime); record.setEndTime(endTime); } // 获取时间 - private Long timeGain(Integer day) { + private Date timeGain(Integer day) { Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 0); calendar.set(Calendar.MINUTE, 0); @@ -154,6 +154,6 @@ public class PlayletRevenueRecordAppServiceImpl implements PlayletRevenueRecordA if (ObjectUtils.isNotNull(day)) { calendar.set(Calendar.DATE, day); } - return calendar.getTimeInMillis(); + return calendar.getTime(); } } diff --git a/playlet-admin/src/main/resources/application.yml b/playlet-admin/src/main/resources/application.yml index a11b465..b06f528 100644 --- a/playlet-admin/src/main/resources/application.yml +++ b/playlet-admin/src/main/resources/application.yml @@ -99,6 +99,8 @@ mybatis: mybatis-plus: mapper-locations: classpath*:mapper/**/*Mapper.xml type-aliases-package: com.playlet.**.domain + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # PageHelper分页插件 pagehelper: 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 3cdd0a2..1193592 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 @@ -11,6 +11,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import com.playlet.common.annotation.Excel; +import java.util.Date; + /** * @Date: 2024-03-17 * @Author: 但星霖 @@ -114,7 +116,7 @@ public class PlayletRevenueRecord extends BaseEntity { */ @Excel(name = "推送收益时间(此处为外部平台推入 建议使用时间戳后续数据转换。)") @ApiModelProperty(value = "推送收益时间(此处为外部平台推入 建议使用时间戳后续数据转换。) 时间戳") - private Long pushTime; + private Date pushTime; /** 剧场类型 */ @Excel(name = "剧场类型") @@ -123,9 +125,9 @@ public class PlayletRevenueRecord extends BaseEntity { @TableField(exist = false) @ApiModelProperty(value = "开始时间") - private Long startTime; + private Date startTime; @TableField(exist = false) @ApiModelProperty(value = "结束时间") - private Long endTime; + private Date endTime; } 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 db5be40..7379b26 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 @@ -1,9 +1,6 @@ package com.playlet.system.service.impl; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -134,8 +131,8 @@ public class PlayletRevenueRecordServiceImpl extends ServiceImpl and estimate_earnings = #{estimateEarnings} and practical_earnings = #{practicalEarnings} and task_id = #{taskId} - - - and push_time = ]]> #{startTime} + + and date_format(push_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d') - - and push_time #{endTime} + + and date_format(push_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') and item_type = #{itemType}