Commit 2b04ff54 authored by dingzhiwei's avatar dingzhiwei
Browse files

修复微信、支付宝设置订单超时时间问题

parent 63b6b225
......@@ -57,7 +57,7 @@ public class AliApp extends AlipayPaymentService {
model.setSubject(payOrder.getSubject()); //订单标题
model.setBody(payOrder.getBody()); //订单描述信息
model.setTotalAmount(AmountUtil.convertCent2Dollar(payOrder.getAmount().toString())); //支付金额
model.setTimeoutExpress(DateUtil.format(payOrder.getExpiredTime(), DatePattern.NORM_DATETIME_FORMAT)); // 订单超时时间
model.setTimeExpire(DateUtil.format(payOrder.getExpiredTime(), DatePattern.NORM_DATETIME_FORMAT)); // 订单超时时间
req.setNotifyUrl(getNotifyUrl()); // 设置异步通知地址
req.setBizModel(model);
......
......@@ -69,7 +69,7 @@ public class AliBar extends AlipayPaymentService {
model.setSubject(payOrder.getSubject()); //订单标题
model.setBody(payOrder.getBody()); //订单描述信息
model.setTotalAmount(AmountUtil.convertCent2Dollar(payOrder.getAmount().toString())); //支付金额
model.setTimeoutExpress(DateUtil.format(payOrder.getExpiredTime(), DatePattern.NORM_DATETIME_FORMAT)); // 订单超时时间
model.setTimeExpire(DateUtil.format(payOrder.getExpiredTime(), DatePattern.NORM_DATETIME_FORMAT)); // 订单超时时间
req.setNotifyUrl(getNotifyUrl()); // 设置异步通知地址
req.setBizModel(model);
......
......@@ -67,7 +67,7 @@ public class AliJsapi extends AlipayPaymentService {
model.setSubject(payOrder.getSubject()); //订单标题
model.setBody(payOrder.getBody()); //订单描述信息
model.setTotalAmount(AmountUtil.convertCent2Dollar(payOrder.getAmount().toString())); //支付金额
model.setTimeoutExpress(DateUtil.format(payOrder.getExpiredTime(), DatePattern.NORM_DATETIME_FORMAT)); // 订单超时时间
model.setTimeExpire(DateUtil.format(payOrder.getExpiredTime(), DatePattern.NORM_DATETIME_FORMAT)); // 订单超时时间
model.setBuyerId(bizRQ.getBuyerUserId());
req.setNotifyUrl(getNotifyUrl()); // 设置异步通知地址
req.setBizModel(model);
......
......@@ -61,7 +61,7 @@ public class AliPc extends AlipayPaymentService {
model.setSubject(payOrder.getSubject()); //订单标题
model.setBody(payOrder.getBody()); //订单描述信息
model.setTotalAmount(AmountUtil.convertCent2Dollar(payOrder.getAmount().toString())); //支付金额
model.setTimeoutExpress(DateUtil.format(payOrder.getExpiredTime(), DatePattern.NORM_DATETIME_FORMAT)); // 订单超时时间
model.setTimeExpire(DateUtil.format(payOrder.getExpiredTime(), DatePattern.NORM_DATETIME_FORMAT)); // 订单超时时间
model.setProductCode("FAST_INSTANT_TRADE_PAY");
model.setQrPayMode("2"); //订单码-跳转模式
req.setNotifyUrl(getNotifyUrl()); // 设置异步通知地址
......
......@@ -60,7 +60,7 @@ public class AliQr extends AlipayPaymentService {
model.setSubject(payOrder.getSubject()); //订单标题
model.setBody(payOrder.getBody()); //订单描述信息
model.setTotalAmount(AmountUtil.convertCent2Dollar(payOrder.getAmount().toString())); //支付金额
model.setTimeoutExpress(DateUtil.format(payOrder.getExpiredTime(), DatePattern.NORM_DATETIME_FORMAT)); // 订单超时时间
model.setTimeExpire(DateUtil.format(payOrder.getExpiredTime(), DatePattern.NORM_DATETIME_FORMAT)); // 订单超时时间
req.setNotifyUrl(getNotifyUrl()); // 设置异步通知地址
req.setBizModel(model);
......
......@@ -61,7 +61,7 @@ public class AliWap extends AlipayPaymentService {
model.setSubject(payOrder.getSubject()); //订单标题
model.setBody(payOrder.getBody()); //订单描述信息
model.setTotalAmount(AmountUtil.convertCent2Dollar(payOrder.getAmount().toString())); //支付金额
model.setTimeoutExpress(DateUtil.format(payOrder.getExpiredTime(), DatePattern.NORM_DATETIME_FORMAT)); // 订单超时时间
model.setTimeExpire(DateUtil.format(payOrder.getExpiredTime(), DatePattern.NORM_DATETIME_FORMAT)); // 订单超时时间
model.setProductCode("QUICK_WAP_PAY");
req.setNotifyUrl(getNotifyUrl()); // 设置异步通知地址
req.setReturnUrl(getReturnUrl()); // 同步跳转地址
......
......@@ -95,7 +95,7 @@ public class WxpayPaymentService extends AbstractPaymentService {
request.setSpbillCreateIp(payOrder.getClientIp());
request.setNotifyUrl(getNotifyUrl());
request.setProductId(System.currentTimeMillis()+"");
request.setTimeExpire(DateUtil.format(payOrder.getExpiredTime(), DatePattern.NORM_DATE_FORMAT));
request.setTimeExpire(DateUtil.format(payOrder.getExpiredTime(), DatePattern.PURE_DATETIME_PATTERN));
//订单分账, 将冻结商户资金。
if(isDivisionOrder(payOrder)){
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment