|
|
@ -1558,7 +1558,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public String getQrCodeBoard(JSONObject client, QRCodeConfig config,JSONObject account,String plantform) {
|
|
|
|
public String getQrCodeBoard(JSONObject client, QRCodeConfig config,JSONObject account,String plantform) {
|
|
|
|
// JSONObject org = orgMapper.findOne(client.getIntValue("org_id"));
|
|
|
|
// 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
|
|
|
|
@Override
|
|
|
@ -1582,7 +1583,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
qrboardConfig.put("brandw", "600");
|
|
|
|
qrboardConfig.put("brandw", "600");
|
|
|
|
qrboardConfig.put("brandh", "200");
|
|
|
|
qrboardConfig.put("brandh", "200");
|
|
|
|
String type = qrboardConfig.getString("type");
|
|
|
|
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);
|
|
|
|
board.drawBoardImage(ous);
|
|
|
|
} catch (Exception e) {
|
|
|
|
} catch (Exception e) {
|
|
|
|
throw new ServerErrorException("QR board config not set for current organize", 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);
|
|
|
|
JSONObject qrboardConfig = JSON.parseObject(qrBoardConfigString);
|
|
|
|
|
|
|
|
|
|
|
|
String type = qrboardConfig.getString("type");
|
|
|
|
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);
|
|
|
|
board.drawBoardImage(ous);
|
|
|
|
} catch (Exception e) {
|
|
|
|
} catch (Exception e) {
|
|
|
|
throw new ServerErrorException("QR board config not set for current organize", e);
|
|
|
|
throw new ServerErrorException("QR board config not set for current organize", e);
|
|
|
|