Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage

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

@@ -429,7 +429,7 @@ public class RetailAppServiceImp implements RetailAppService {
                 default:
                     break;
             }
-            Calendar calendar = (Calendar) order.get("create_time");
+            Calendar calendar = (Calendar) order.get("transaction_time");
             String trade_date = DateFormatUtils.format(calendar, "yyyy-MM-dd");
             String trade_time = DateFormatUtils.format(calendar, "HH:mm:ss");
             order.put("trade_date", trade_date);

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

@@ -669,7 +669,7 @@
             <if test="client_ids==null and client_id !=null">
                 and o.client_id=#{client_id}
             </if>
-            <if test="from!=null">and t.transaciton_time &gt;= #{from}</if>
+            <if test="from!=null">and t.transaction_time &gt;= #{from}</if>
             <if test="to!=null">and t.transaction_time &lt; #{to}</if>
             <if test="date!=null">and date(t.transaction_time)=date(#{date})
             </if>