BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 802a7b0a30b0327f446700df4a1dfaf04aabc064

Authored by zwy
1 parent 29a38498

:sparkles: 

【支付模块】
修改时间 格式 yyyyMMddHHmmss 为 yyyy-MM-dd'T'HH:mm:ssXXX
Inline Side-by-side
Showing 2 changed files with 5 additions and 9 deletions
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXNativePayClient.java
  View file @802a7b0
... ... @@ -28,11 +28,7 @@ import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString
28 28 import static cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXCodeMapping.CODE_SUCCESS;
29 29 import static cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXCodeMapping.MESSAGE_SUCCESS;
30 30  
31   -/**
32   - * @Description: Native支付
33   - * @author: zwy
34   - * @date: 2022年04月18日 17:00
35   - */
  31 +
36 32 @Slf4j
37 33 public class WXNativePayClient extends AbstractPayClient<WXPayClientConfig> {
38 34 private WxPayService client;
... ... @@ -95,7 +91,7 @@ public class WXNativePayClient extends AbstractPayClient&lt;WXPayClientConfig&gt; {
95 91 .outTradeNo(reqDTO.getMerchantOrderId())
96 92 .body(reqDTO.getBody())
97 93 .totalFee(reqDTO.getAmount().intValue()) // 单位分
98   -// .timeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyyMMddHHmmss"))
  94 + .timeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyy-MM-dd'T'HH:mm:ssXXX"))
99 95 .spbillCreateIp(reqDTO.getUserIp())
100 96 .notifyUrl(reqDTO.getNotifyUrl())
101 97 .productId(trade_type)
... ... @@ -126,7 +122,7 @@ public class WXNativePayClient extends AbstractPayClient&lt;WXPayClientConfig&gt; {
126 122 // 转换结果
127 123 return PayOrderNotifyRespDTO.builder().orderExtensionNo(notifyResult.getOutTradeNo())
128 124 .channelOrderNo(notifyResult.getTransactionId()).channelUserId(notifyResult.getOpenid())
129   - .successTime(DateUtil.parse(notifyResult.getTimeEnd(), "yyyyMMddHHmmss"))
  125 + .successTime(DateUtil.parse(notifyResult.getTimeEnd(), "yyyy-MM-dd'T'HH:mm:ssXXX"))
130 126 .data(data.getBody()).build();
131 127 }
132 128  
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXPubPayClient.java
  View file @802a7b0
... ... @@ -98,7 +98,7 @@ public class WXPubPayClient extends AbstractPayClient&lt;WXPayClientConfig&gt; {
98 98 // TODO 芋艿：貌似没 title？
99 99 .body(reqDTO.getBody())
100 100 .totalFee(reqDTO.getAmount().intValue()) // 单位分
101   - .timeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyyMMddHHmmss"))
  101 + .timeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyy-MM-dd'T'HH:mm:ssXXX"))
102 102 .spbillCreateIp(reqDTO.getUserIp())
103 103 .openid(getOpenid(reqDTO))
104 104 .notifyUrl(reqDTO.getNotifyUrl())
... ... @@ -114,7 +114,7 @@ public class WXPubPayClient extends AbstractPayClient&lt;WXPayClientConfig&gt; {
114 114 // TODO 芋艿：貌似没 title？
115 115 request.setDescription(reqDTO.getBody());
116 116 request.setAmount(new WxPayUnifiedOrderV3Request.Amount().setTotal(reqDTO.getAmount().intValue())); // 单位分
117   - request.setTimeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyyMMddHHmmss"));
  117 + request.setTimeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyy-MM-dd'T'HH:mm:ssXXX"));
118 118 request.setPayer(new WxPayUnifiedOrderV3Request.Payer().setOpenid(getOpenid(reqDTO)));
119 119 request.setSceneInfo(new WxPayUnifiedOrderV3Request.SceneInfo().setPayerClientIp(reqDTO.getUserIp()));
120 120 request.setNotifyUrl(reqDTO.getNotifyUrl());
... ...