diff --git a/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepManageController.java b/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepManageController.java index b7bcd9b..423a4e8 100644 --- a/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepManageController.java +++ b/src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepManageController.java @@ -76,12 +76,12 @@ public class FitnessWalkStepManageController { /*DateTime activityStartDate = DateUtil.date(start_time); DateTime activityEndDate = DateUtil.date(end_time);*/ -// FitnessWalkActivity activity = fitnessWalkCommonService.getActivity(activityId); -// -// Date startDate = DateUtil.parse(DateUtil.format(DateUtil.date(activity.getStartTime()), "yyyy-MM-dd"), "yyyy-MM-dd"); -// Date endDate = DateUtil.parse(DateUtil.format(DateUtil.date(activity.getEndTime()), "yyyy-MM-dd"), "yyyy-MM-dd"); - Date startDate = DateUtil.parse("2025-04-01 00:00:00", "yyyy-MM-dd HH:mm:ss"); - Date endDate = DateUtil.parse("2025-05-06 23:59:59", "yyyy-MM-dd HH:mm:ss"); + FitnessWalkActivity activity = fitnessWalkCommonService.getActivity(activityId); + + Date startDate = DateUtil.parse(DateUtil.format(DateUtil.date(activity.getStartTime()), "yyyy-MM-dd"), "yyyy-MM-dd"); + Date endDate = DateUtil.parse(DateUtil.format(DateUtil.date(activity.getEndTime()), "yyyy-MM-dd"), "yyyy-MM-dd"); +// Date startDate = DateUtil.parse("2025-04-01 00:00:00", "yyyy-MM-dd HH:mm:ss"); +// Date endDate = DateUtil.parse("2025-05-06 23:59:59", "yyyy-MM-dd HH:mm:ss"); if (!DateUtil.isIn(DateUtil.date(), startDate, endDate)) { return Result.error("已过活动时间,无法上传步数"); } diff --git a/src/main/java/io/v/nutz/zhgh/fitnessWalk/service/impl/FitnessWalkCommonServiceImpl.java b/src/main/java/io/v/nutz/zhgh/fitnessWalk/service/impl/FitnessWalkCommonServiceImpl.java index 504abc8..5a41484 100644 --- a/src/main/java/io/v/nutz/zhgh/fitnessWalk/service/impl/FitnessWalkCommonServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/fitnessWalk/service/impl/FitnessWalkCommonServiceImpl.java @@ -448,7 +448,7 @@ public class FitnessWalkCommonServiceImpl extends ViServiceImpl implements Fitne userId ) AS over3k ON u.id = over3k.userId $condition - """).setParam("activityId",activityId).setParam("step",6000); + """).setParam("activityId",activityId).setParam("step",4000); if ("today".equals(mode)) { sql.setVar("dateSql",new Static("DATE(applyDate) = '"+DateUtil.today()+"'")); diff --git a/src/main/resources/views/mobile/home.html b/src/main/resources/views/mobile/home.html index b273793..658e39b 100644 --- a/src/main/resources/views/mobile/home.html +++ b/src/main/resources/views/mobile/home.html @@ -490,6 +490,7 @@ layout("/mobile/platform.html"){ +