Merge remote-tracking branch 'origin/develop' into develop

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

@@ -434,6 +434,13 @@ public class RetailAppServiceImp implements RetailAppService {
             String trade_time = DateFormatUtils.format(calendar, "HH:mm:ss");
             order.put("trade_date", trade_date);
             order.put("trade_time", trade_time);
+            //todo
+            if ("Debit".equals(order.getString("transaction_type"))){
+                order.put("currency","AUD");
+            }
+            if ("CNY".equals(order.getString("currency"))){
+                order.put("clearing_amount",order.getBigDecimal("total_amount"));
+            }
             if (!date_contains.contains(trade_date)) {
                 String re_date = trade_date.replaceAll("-", "");
                 TradeLogQuery date_query = new TradeLogQuery();

src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml

@@ -637,6 +637,7 @@
         select
         o.order_id,
         o.client_id,
+        o.total_amount,
         o.display_amount,
         o.customer_payment_amount,
         o.coupon_payment_amount,