update

src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java

@@ -2,9 +2,6 @@ package au.com.royalpay.payment.manage.application.beans;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import org.apache.commons.lang3.time.DateUtils;
-
-import java.util.Date;
 
 /**
  * Created by yuan on 2018/5/23.

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -1633,8 +1633,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);
-        return merchantInfoProvider.getQrCodeBoard(client, config,account,plantform);
+        return merchantInfoProvider.getQrCodeBoard(client, config);
+//        return merchantInfoProvider.getQrCodeBoard(client, config,account,plantform);
     }
 
     @Override
@@ -1658,8 +1658,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);
+//            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);
@@ -1679,8 +1679,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);
+//            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);

src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java

@@ -185,7 +185,7 @@ public class CustomerImpressionImplTest {
         JSONObject var = new JSONObject();
         var.put("client_moniker", client.getString("client_moniker"));
         var.put("short_name", client.getString("short_name"));
-        JSONObject result = mailGunClient.addListMember(client.getString("contact_email"), "merchants@mail.royalpay.com.au", client.getString("contact_person"),
+        JSONObject result = mailGunClient.addListMember(client.getString("contact_email"), "merchants@mail.royalpay.com.au", client.getString("contact_person"),"",
                 var);
     }