Merge branch 'develop'

src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java

@@ -190,6 +190,16 @@ public class TestController implements ApplicationEventPublisherAware {
             if (bestPayRate != null) {
                 client.put("bestpay_rate", bestPayRate.getBigDecimal("rate_value").setScale(2, BigDecimal.ROUND_DOWN));
             }
+
+            JSONObject jdRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "jd");
+            if (jdRate != null) {
+                client.put("jd_rate", jdRate.getBigDecimal("rate_value").setScale(2, BigDecimal.ROUND_DOWN));
+            }
+
+            JSONObject alipayOnlineRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "AlipayOnline");
+            if (alipayOnlineRate != null) {
+                client.put("alipay_online_rate", alipayOnlineRate.getBigDecimal("rate_value").setScale(2, BigDecimal.ROUND_DOWN));
+            }
         } catch (Exception ignored) {
             //do nothing
         }