jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
b7b971c2 1 parent d9b740c6

fix(service): 修复订单取消时间判断错误

Inline Side-by-side
Showing 1 changed file with 1 additions and 5 deletions
...@@ -2,10 +2,8 @@ package com.infoloop.tianting.service.client; ...@@ -2,10 +2,8 @@ package com.infoloop.tianting.service.client;
2 2
3 import cn.hutool.core.convert.Convert; 3 import cn.hutool.core.convert.Convert;
4 import com.fasterxml.jackson.annotation.JsonInclude; 4 import com.fasterxml.jackson.annotation.JsonInclude;
5 -import com.fasterxml.jackson.core.JsonParser.Feature;
6 import com.fasterxml.jackson.core.JsonProcessingException; 5 import com.fasterxml.jackson.core.JsonProcessingException;
7 import com.fasterxml.jackson.databind.DeserializationFeature; 6 import com.fasterxml.jackson.databind.DeserializationFeature;
8 -import com.fasterxml.jackson.databind.MapperFeature;
9 import com.fasterxml.jackson.databind.ObjectMapper; 7 import com.fasterxml.jackson.databind.ObjectMapper;
10 import com.fasterxml.jackson.databind.PropertyNamingStrategy; 8 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
11 import com.fasterxml.jackson.dataformat.xml.XmlMapper; 9 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
...@@ -39,8 +37,6 @@ import com.infoloop.tianting.utils.JsonUtil; ...@@ -39,8 +37,6 @@ import com.infoloop.tianting.utils.JsonUtil;
39 import lombok.RequiredArgsConstructor; 37 import lombok.RequiredArgsConstructor;
40 import lombok.extern.slf4j.Slf4j; 38 import lombok.extern.slf4j.Slf4j;
41 import okhttp3.OkHttpClient; 39 import okhttp3.OkHttpClient;
42 -import okhttp3.Request;
43 -import okhttp3.Response;
44 import org.apache.commons.codec.binary.Base64; 40 import org.apache.commons.codec.binary.Base64;
45 import org.apache.commons.codec.digest.DigestUtils; 41 import org.apache.commons.codec.digest.DigestUtils;
46 import org.springframework.beans.factory.annotation.Autowired; 42 import org.springframework.beans.factory.annotation.Autowired;
...@@ -337,7 +333,7 @@ public class PayServiceClient { ...@@ -337,7 +333,7 @@ public class PayServiceClient {
337 LocalDate today = LocalDate.now(); 333 LocalDate today = LocalDate.now();
338 LocalDate tomorrow = today.plusDays(1); 334 LocalDate tomorrow = today.plusDays(1);
339 LocalDateTime tomorrowZero = tomorrow.atStartOfDay(); 335 LocalDateTime tomorrowZero = tomorrow.atStartOfDay();
340 - LocalDateTime orderPayTime = DateUtil.toLocalDateTime(orderById.getPayTime()); 336 + LocalDateTime orderPayTime = DateUtil.toLocalDateTime(orderById.getPayTime()).minusHours(8);
341 if (!orderPayTime.isBefore(tomorrowZero)) { 337 if (!orderPayTime.isBefore(tomorrowZero)) {
342 log.info("Order {} pay is beyond cancel time.", orderId); 338 log.info("Order {} pay is beyond cancel time.", orderId);
343 throw ClientEndExceptions.BusinessException.build(ErrorCodeEnum.ORDER_PAY_REFUND_FAILED); 339 throw ClientEndExceptions.BusinessException.build(ErrorCodeEnum.ORDER_PAY_REFUND_FAILED);
......