Merge branch 'updat' into develop

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

@@ -847,11 +847,11 @@ public class RetailAppServiceImp implements RetailAppService {
             channels.add(wechat);
         }
         JSONObject alipay = getChannel(clientId, now, "Alipay");
-        if (wechat.containsKey("channel")) {
+        if (alipay.containsKey("channel")) {
             channels.add(alipay);
         }
         JSONObject bestpay = getChannel(clientId, now, "Bestpay");
-        if (wechat.containsKey("channel")) {
+        if (bestpay.containsKey("channel")) {
             channels.add(bestpay);
         }
         JSONObject jd = getChannel(clientId, now, "jd");