Showing
1 changed file
with
6 additions
and
2 deletions
| ... | @@ -70,6 +70,7 @@ import java.io.ByteArrayOutputStream; | ... | @@ -70,6 +70,7 @@ import java.io.ByteArrayOutputStream; |
| 70 | import java.io.IOException; | 70 | import java.io.IOException; |
| 71 | import java.math.BigDecimal; | 71 | import java.math.BigDecimal; |
| 72 | import java.math.RoundingMode; | 72 | import java.math.RoundingMode; |
| 73 | +import java.time.Instant; | ||
| 73 | import java.time.LocalDate; | 74 | import java.time.LocalDate; |
| 74 | import java.time.LocalDateTime; | 75 | import java.time.LocalDateTime; |
| 75 | import java.time.temporal.ChronoUnit; | 76 | import java.time.temporal.ChronoUnit; |
| ... | @@ -1130,12 +1131,15 @@ public class SettlementServiceImpl implements SettlementService { | ... | @@ -1130,12 +1131,15 @@ public class SettlementServiceImpl implements SettlementService { |
| 1130 | return ""; | 1131 | return ""; |
| 1131 | } | 1132 | } |
| 1132 | 1133 | ||
| 1134 | + /** 与 PayServiceClient 支付/退款中 payTime 展示逻辑一致,避免多 8 小时。 */ | ||
| 1133 | private static String formatSettlementPayTime(long payTimeMillis) { | 1135 | private static String formatSettlementPayTime(long payTimeMillis) { |
| 1134 | if (payTimeMillis == 0L) { | 1136 | if (payTimeMillis == 0L) { |
| 1135 | return ""; | 1137 | return ""; |
| 1136 | } | 1138 | } |
| 1137 | - final String formatted = DateUtil.formatDate(payTimeMillis, DateUtil.Y_M_D_H_M_S); | 1139 | + return Instant.ofEpochMilli(payTimeMillis) |
| 1138 | - return formatted != null ? formatted : ""; | 1140 | + .atZone(DateUtil.CHINA_ZONE) |
| 1141 | + .minusHours(8) | ||
| 1142 | + .format(DateUtil.Y_M_D_H_M_S); | ||
| 1139 | } | 1143 | } |
| 1140 | 1144 | ||
| 1141 | /** | 1145 | /** | ... | ... |
-
Please register or login to post a comment