From eacb8d89de0b77252687b868b9423f5d602699a5 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Fri, 20 Apr 2018 13:47:43 +0800 Subject: [PATCH] update --- .../payment/manage/merchants/core/ClientManager.java | 6 +++--- .../merchants/core/impls/ClientManagerImpl.java | 12 ++++++------ .../merchants/web/PartnerManageController.java | 4 ++-- .../manage/merchants/web/PartnerViewController.java | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java index 8d2fee401..b8cb2b346 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java @@ -164,11 +164,11 @@ public interface ClientManager { JSONObject getQRCode(JSONObject manager, String clientMoniker, QRCodeConfig config); - String getQrCodeBoard(JSONObject client, QRCodeConfig config,JSONObject account); + String getQrCodeBoard(JSONObject client, QRCodeConfig config,JSONObject account,String plantform); - void writeAggregateQrCodeBoard(JSONObject manager, String clientMoniker, QRCodeConfig config, OutputStream ous); + void writeAggregateQrCodeBoard(JSONObject manager, String clientMoniker, QRCodeConfig config, OutputStream ous,String plantform); - void writeQrCodeBoard(JSONObject manager, String clientMoniker, QRCodeConfig config, OutputStream ous); + void writeQrCodeBoard(JSONObject manager, String clientMoniker, QRCodeConfig config, OutputStream ous,String plantform); void writePoster(JSONObject manager, String clientMoniker, OutputStream ous); 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 39e6aa9a8..6a08a4898 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 @@ -1522,13 +1522,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } @Override - public String getQrCodeBoard(JSONObject client, QRCodeConfig config,JSONObject account) { + 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); + return merchantInfoProvider.getQrCodeBoard(client, config,account,plantform); } @Override - public void writeAggregateQrCodeBoard(JSONObject manager, String clientMoniker, QRCodeConfig config, OutputStream ous) { + public void writeAggregateQrCodeBoard(JSONObject manager, String clientMoniker, QRCodeConfig config, OutputStream ous,String plantform) { JSONObject client = clientDetail(manager, clientMoniker); try { JSONObject qrboardConfig = new JSONObject(); @@ -1548,7 +1548,7 @@ 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); + QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config,mongoTemplate,manager,plantform); board.drawBoardImage(ous); } catch (Exception e) { throw new ServerErrorException("QR board config not set for current organize", e); @@ -1556,7 +1556,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } @Override - public void writeQrCodeBoard(JSONObject manager, String clientMoniker, QRCodeConfig config, OutputStream ous) { + public void writeQrCodeBoard(JSONObject manager, String clientMoniker, QRCodeConfig config, OutputStream ous,String plantform) { JSONObject client = clientDetail(manager, clientMoniker); JSONObject org = orgMapper.findOne(client.getIntValue("org_id")); try { @@ -1568,7 +1568,7 @@ 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); + QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config,mongoTemplate,manager,plantform); board.drawBoardImage(ous); } catch (Exception e) { throw new ServerErrorException("QR board config not set for current organize", e); diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java index 1c2c1c68f..3793bcb19 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java @@ -92,7 +92,7 @@ public class PartnerManageController { response.setContentType("application/octet-stream;"); response.addHeader("Content-Disposition", "attachment; filename=qr_board.jpg"); OutputStream ous = response.getOutputStream(); - clientManager.writeQrCodeBoard(manager, clientMoniker, config, ous); + clientManager.writeQrCodeBoard(manager, clientMoniker, config, ous,"PC"); } @ManagerMapping(value = "/{clientMoniker}/qrcode_board/aggregate", method = RequestMethod.GET) @@ -101,7 +101,7 @@ public class PartnerManageController { response.setContentType("application/octet-stream;"); response.addHeader("Content-Disposition", "attachment; filename=qr_board.jpg"); OutputStream ous = response.getOutputStream(); - clientManager.writeAggregateQrCodeBoard(manager, clientMoniker, config, ous); + clientManager.writeAggregateQrCodeBoard(manager, clientMoniker, config, ous,"PC"); } @ManagerMapping(value = "/{clientMoniker}/poster", method = RequestMethod.GET) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java index f52f2c543..59567a097 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java @@ -83,7 +83,7 @@ public class PartnerViewController { response.setContentType("application/octet-stream"); response.addHeader("Content-Disposition", "attachment; filename=qr_board.jpg"); OutputStream ous = response.getOutputStream(); - clientManager.writeQrCodeBoard(null, account.getString("client_moniker"), config, ous); + clientManager.writeQrCodeBoard(null, account.getString("client_moniker"), config, ous,"PC"); } @PartnerMapping(value = "/qrcode_board/aggregate", method = RequestMethod.GET) @@ -92,7 +92,7 @@ public class PartnerViewController { response.setContentType("application/octet-stream"); response.addHeader("Content-Disposition", "attachment; filename=qr_board.jpg"); OutputStream ous = response.getOutputStream(); - clientManager.writeAggregateQrCodeBoard(null, account.getString("client_moniker"), config, ous); + clientManager.writeAggregateQrCodeBoard(null, account.getString("client_moniker"), config, ous,"pc"); } @PartnerMapping(value = "/poster", method = RequestMethod.GET)