AlipayAps对外展示Alipay+

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