diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java index b94989c9..80e12780 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java @@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; +import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -118,9 +119,10 @@ public class MemberUserController { @Operation(summary = "获得会员热量分析") @PreAuthorize("@ss.hasPermission('member:user:query')") public CommonResult> getUserHeat(@RequestParam(value = "userId",required = false) Long userId, - @RequestParam(value = "days",required = false)Integer days, + @RequestParam(value = "startDate",required = false) LocalDateTime startDate, + @RequestParam(value = "endDate",required = false) LocalDateTime endDate, @RequestParam(value = "orderId",required = false)Long orderId){ - return success(memberUserService.getUserHeat(userId,days,orderId)); + return success(memberUserService.getUserHeat(userId,startDate,endDate,orderId)); } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java index 875ec2d3..5ccbb5be 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java @@ -15,6 +15,7 @@ import cn.iocoder.yudao.module.member.controller.app.user.vo.AppNutritionWeekVO; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; import javax.validation.Valid; +import java.time.LocalDateTime; import java.util.Collection; import java.util.List; import java.util.Map; @@ -208,7 +209,7 @@ public interface MemberUserService { */ List NutritionWeek(String start, String end); - List getUserHeat(Long userId,Integer days,Long orderId); + List getUserHeat(Long userId, LocalDateTime startDate,LocalDateTime endDate, Long orderId); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java index aae5c005..61d6eee3 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java @@ -544,20 +544,11 @@ public class MemberUserServiceImpl implements MemberUserService { } @Override - public List getUserHeat(Long userId, Integer days,Long orderId) { + public List getUserHeat(Long userId, LocalDateTime startDate,LocalDateTime endDate,Long orderId) { if(ObjectUtil.isNotEmpty(orderId)){ return suggestion(userId,null,null,Boolean.FALSE,orderId); - } - //判断是一天与一周 - if(days==7){ - LocalDateTime endDate = LocalDateTimeUtil.now(); - LocalDateTime offset = LocalDateTimeUtil.offset(endDate, -7, ChronoUnit.DAYS); - LocalDateTime startDate = LocalDateTimeUtil.beginOfDay(offset); - return suggestion(userId,startDate,endDate,Boolean.TRUE,null); }else{ - LocalDateTime endDate = LocalDateTimeUtil.now(); - LocalDateTime startDate = LocalDateTimeUtil.beginOfDay(endDate); - return suggestion(userId,startDate,endDate,Boolean.FALSE,null); + return suggestion(userId,startDate,endDate,Boolean.TRUE,null); } } public List suggestion(Long userId,LocalDateTime startDate,LocalDateTime endDate,Boolean bol,Long orderId) {