爱心互助积分 改为分钟

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/LocalDateUtils.java

@@ -4,6 +4,8 @@ package com.elink.esua.epdc.commons.tools.utils;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.*;
 import java.util.Date;
 
@@ -66,6 +68,10 @@ public class LocalDateUtils {
         return durationHours(dateToLocalDateTime(start), dateToLocalDateTime(end), scale);
     }
 
+    public static BigDecimal durationMinutes(Date start, Date end, int scale) {
+        return durationMinutes(dateToLocalDateTime(start), dateToLocalDateTime(end), scale);
+    }
+
     /**
      * {@link LocalDateUtils#durationHours(Date, Date, int)}
      *
@@ -84,4 +90,12 @@ public class LocalDateUtils {
         return BigDecimal.valueOf(minutes).divide(BigDecimal.valueOf(NumConstant.SIXTY), scale, BigDecimal.ROUND_HALF_UP);
     }
 
+    public static BigDecimal durationMinutes(LocalDateTime start, LocalDateTime end, int scale) {
+        // 两个时间的间隔，早的时间点在前，晚的再后，否则为负数
+        Duration duration = Duration.between(start, end);
+        // 间隔多少分钟，
+        long minutes = duration.toMinutes();
+        return BigDecimal.valueOf(minutes);
+    }
+
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java

@@ -346,7 +346,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
         ActUserRelationDTO actUserRelationDto = actUserRelationService.get(actUserId);
         if (null != actUserRelationDto) {
             EpdcVolunteerKindnessTimeFormDTO formDto = new EpdcVolunteerKindnessTimeFormDTO();
-            formDto.setKindnessTime(LocalDateUtils.durationHours(actInfo.getActStartTime(), actInfo.getActEndTime(), NumConstant.TWO));
+            formDto.setKindnessTime(LocalDateUtils.durationMinutes(actInfo.getActStartTime(), actInfo.getActEndTime(), NumConstant.TWO));
             formDto.setUserId(actUserRelationDto.getUserId());
             return userInfoFeignClient.addKindnessTime(formDto);
         }