From 992a696e2573a49b6db56acd31496ea80fa13bc5 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Fri, 4 May 2018 16:38:11 +0800
Subject: [PATCH] update

---
 .../manage/merchants/core/impls/ClientManagerImpl.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index 1d22b6a9c..c45656eaa 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -1558,7 +1558,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     @Override
     public String getQrCodeBoard(JSONObject client, QRCodeConfig config,JSONObject account,String plantform) {
         // JSONObject org = orgMapper.findOne(client.getIntValue("org_id"));
-        return merchantInfoProvider.getQrCodeBoard(client, config,account,plantform);
+        return merchantInfoProvider.getQrCodeBoard(client, config);
+//        return merchantInfoProvider.getQrCodeBoard(client, config,account,plantform);
     }
 
     @Override
@@ -1582,7 +1583,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             qrboardConfig.put("brandw", "600");
             qrboardConfig.put("brandh", "200");
             String type = qrboardConfig.getString("type");
-            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config,mongoTemplate,manager,plantform);
+//            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config,mongoTemplate,manager,plantform);
+            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config);
             board.drawBoardImage(ous);
         } catch (Exception e) {
             throw new ServerErrorException("QR board config not set for current organize", e);
@@ -1602,7 +1604,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             JSONObject qrboardConfig = JSON.parseObject(qrBoardConfigString);
 
             String type = qrboardConfig.getString("type");
-            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config,mongoTemplate,manager,plantform);
+//            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config,mongoTemplate,manager,plantform);
+            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config);
             board.drawBoardImage(ous);
         } catch (Exception e) {
             throw new ServerErrorException("QR board config not set for current organize", e);