From fb9eec2eec1f1052b31f6fa96bbf46dd71e70cc2 Mon Sep 17 00:00:00 2001 From: dalong306 <304592994@qq.com> Date: Fri, 17 Sep 2021 17:57:11 +0800 Subject: [PATCH] =?UTF-8?q?AlipayAps=E5=AF=B9=E5=A4=96=E5=B1=95=E7=A4=BAAl?= =?UTF-8?q?ipay+?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appclient/core/impls/RetailAppServiceImp.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index f1dcb0933..2c034cf31 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -985,11 +985,16 @@ public class RetailAppServiceImp implements RetailAppService { for (JSONObject order : orders) { order.put("geek_apply_deduction", order.getBooleanValue("geek_apply_deduction")); Calendar calendar = (Calendar) order.get("transaction_time"); - if (timezone != null) { + String tradeDate=null; + String tradeTime=null; + if (calendar!=null&&timezone != null) { calendar.setTimeZone(TimeZone.getTimeZone(timezone)); + tradeDate = DateFormatUtils.format(calendar, "yyyy-MM-dd", calendar.getTimeZone()); + tradeTime = DateFormatUtils.format(calendar, "HH:mm:ss", calendar.getTimeZone()); + } + if("AlipayAps".equalsIgnoreCase(order.getString("channel"))){ + order.put("channel","Alipay+"); } - String tradeDate = DateFormatUtils.format(calendar, "yyyy-MM-dd", calendar.getTimeZone()); - String tradeTime = DateFormatUtils.format(calendar, "HH:mm:ss", calendar.getTimeZone()); order.put("trade_date", tradeDate); order.put("trade_time", tradeTime); // todo