Merge branch 'develop'

src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java

@@ -483,7 +483,9 @@ public class TradeLogServiceImpl implements TradeLogService {
             logs.stream().forEach(p -> {
                 String login_id = p.getString("login_id");
                 if (StringUtils.isNotEmpty(login_id)) {
-                    p.put("order_detail", (StringUtils.isEmpty(p.getString("order_detail")) ? "" : p.getString("order_detail")) + "(alipay_id:" + login_id + ")");
+                    p.put("order_detail", (StringUtils.isEmpty(p.getString("order_detail")) ? "" : login_id+":"+p.getString("order_detail")));
+                }else{
+                    p.put("order_detail", (StringUtils.isEmpty(p.getString("order_detail")) ? "" : p.getString("order_detail")));
                 }
             });
         }

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

@@ -64,6 +64,36 @@
         WHEN 2 THEN 'Preauthorised'
         END) clear_status,
         o.order_detail,o.display_amount,o.channel,o.currency,o.pre_authorization,
+        CASE o.gateway
+        WHEN 0
+        THEN 'Retail In-Store'
+        WHEN 1
+        THEN 'Retail In-Store'
+        WHEN 2
+        THEN 'QR Code'
+        WHEN 3
+        THEN 'Online API'
+        WHEN 4
+        THEN 'WeChat HTML5'
+        WHEN 5
+        THEN 'Retail API'
+        WHEN 6
+        THEN 'Retail API'
+        WHEN 7
+        THEN 'QR Code'
+        WHEN 8
+        THEN 'Mobile H5'
+        WHEN 9
+        THEN 'Third Party Gateway'
+        WHEN 10
+        THEN 'APP'
+        WHEN 12
+        THEN 'MICROAPP'
+        WHEN 13
+        THEN 'Native QR Code'
+        WHEN 14
+        THEN 'Share Link'
+        END AS                                     gateway,
         CASE o.channel
         WHEN 'Alipay' THEN ra.login_id
         WHEN 'AlipayOnline' THEN ra.login_email
@@ -926,4 +956,4 @@ select  sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,
         order by period_start
     </select>
 
-</mapper>
+</mapper>