From c3b3955a96f1e1f12a562d7c0afb7e48772b1622 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 28 Oct 2022 10:48:38 +0800 Subject: [PATCH] =?UTF-8?q?//=E5=95=86=E5=9C=88=E6=97=B6=E9=97=B4=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../callback/WxBusinessOrderController.java | 2 +- .../callback/WxMemberCardController.java | 2 +- .../impl/WxBusinessCircleOrderServiceImpl.java | 15 +++++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java index e7f183808..72ecfd3bb 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java @@ -39,7 +39,7 @@ public class WxBusinessOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'+'mm:ss", Locale.CHINA); + private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-DDTHH:mm:ss+TIMEZONE"); @Autowired WxMallService wxMallService; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMemberCardController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMemberCardController.java index 97ff7357b..f38441b99 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMemberCardController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMemberCardController.java @@ -44,7 +44,7 @@ public class WxMemberCardController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'+'mm:ss", Locale.CHINA); + private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-DDTHH:mm:ss+TIMEZONE"); @Autowired WxMallService wxMallService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index 1b56257bf..116b5aec1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -35,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -45,6 +46,8 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe private final Logger logger = LoggerFactory.getLogger(this.getClass()); + private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-DDTHH:mm:ss+TIMEZONE"); + private final String WX_CIRCLE_KEY = "CIRCLE:WX:"; @Autowired @@ -405,7 +408,6 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe request.setAppid(wxPayService.getConfig().getAppId()); request.setOpenid(record.getOpenid()); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'+'mm:ss", Locale.CHINA); if(record.getIncreasedPoints() != null && record.getIncreasedPoints() > 0 ){ request.setEarnPoints(true); request.setIncreasedPoints(record.getIncreasedPoints()); @@ -482,15 +484,17 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe updCuser.updateTenantInfo(tenantEntity); updCuser.setOpenId(authorizations.getOpenid()); updCuser.setAuthorizeState(authorizeState.getCode()); - String formaStr = "yyyy-MM-dd'T'HH:mm:ss'+'mm:ss"; - updCuser.setAuthorizeTime(DateUtils.stringToDate(authorizations.getAuthorizeTime(),formaStr)); - updCuser.setDeauthorizeTime(DateUtils.stringToDate(authorizations.getDeauthorizeTime(),formaStr)); + updCuser.setAuthorizeTime(sdf.parse(authorizations.getAuthorizeTime())); + updCuser.setDeauthorizeTime(sdf.parse(authorizations.getDeauthorizeTime())); wxCUserService.updateAuthorizeStateByOpenId(updCuser); } return new ResultData(authorizeState); } catch (WxPayException e) { e.printStackTrace(); return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage()); + } catch (ParseException e) { + e.printStackTrace(); + return new ResultData(ErrorCode.SYS_CLASSCAST_ERROR.getCode(),"时间转换异常"); } } @@ -538,8 +542,7 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe request.setOpenid(openId); request.setPlateNumber(plate_number); request.setState(state); - String formaStr = "yyyy-MM-dd'T'HH:mm:ss'+'mm:ss"; - request.setTime(DateUtils.date2String(time,formaStr)); + request.setTime(sdf.format(time)); wxPayService.getBusinessCircleService().notifyParkings(request); return new ResultData();