diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 046be4ee5..00192414b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -255,8 +255,8 @@ public class RetailAppServiceImp implements RetailAppService { JSONObject res = new JSONObject(); res.put("url", url); res.put("qrcode", QRCodeUtils.qrcodeImageCode(url, 250, false)); -// res.put("qrcode_board", merchantInfoProvider.getQrCodeBoard(client, config,clientAccountMapper.findById(device.getString("account_id")),"APP")); - res.put("qrcode_board", merchantInfoProvider.getQrCodeBoard(client, config)); + res.put("qrcode_board", merchantInfoProvider.getQrCodeBoard(client, config,clientAccountMapper.findById(device.getString("account_id")),"APP")); +// res.put("qrcode_board", merchantInfoProvider.getQrCodeBoard(client, config)); return res; } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientConfigMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientConfigMapper.java index 0c6773bc3..f4d6bc33e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientConfigMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientConfigMapper.java @@ -27,4 +27,7 @@ public interface ClientConfigMapper { @AutoSql(type = SqlType.SELECT) JSONObject find(@Param("client_id") int client_id); + + @AutoSql(type = SqlType.SELECT) + List getAll(); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java index 7e5f17df0..37e3b1f03 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java @@ -74,4 +74,7 @@ public interface ClientMapper { List listSubMerchantId(); List listBySubMerchantId(@Param("sub_merchant_id") String sub_merchant_id); + + @AutoSql(type = SqlType.SELECT) + List AllClients(); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/OrgMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/OrgMapper.java index 844d1433a..3aa028538 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/OrgMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/OrgMapper.java @@ -47,4 +47,7 @@ public interface OrgMapper { PageList listOrgWithPages(JSONObject paraams, PageBounds order); List listOrgAndChild(@Param("org_id") int org_id); + + JSONObject test(@Param("client_id") int client_id); + } 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 ec73b90f2..827aaa9a4 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 @@ -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); diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 91173a856..c9015a1d9 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -1,6 +1,6 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.datasource.schema-name=royalpay_production -spring.datasource.host=192.168.0.49:3306 +spring.datasource.host=192.168.99.100:3306 spring.datasource.url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false spring.datasource.username=root spring.datasource.password=root \ No newline at end of file diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/OrgMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/OrgMapper.xml index b23017706..273837f19 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/OrgMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/OrgMapper.xml @@ -70,4 +70,17 @@ + + + \ No newline at end of file diff --git a/src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java b/src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java index 4c9146935..75473b0f3 100644 --- a/src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java +++ b/src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java @@ -1,6 +1,7 @@ package au.com.royalpay.payment.manage.apps.core.impls; import au.com.royalpay.payment.manage.mappers.payment.OrderMapper; +import au.com.royalpay.payment.manage.mappers.system.ClientConfigMapper; import au.com.royalpay.payment.manage.mappers.system.ClientMapper; import au.com.royalpay.payment.manage.mappers.system.OrgMapper; import au.com.royalpay.payment.tools.mail.MailGunClient; @@ -9,6 +10,7 @@ import au.com.royalpay.payment.tools.mail.SendMail; import com.alibaba.fastjson.JSONObject; import org.apache.commons.codec.binary.Base64; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.junit.Test; import org.junit.runner.RunWith; @@ -21,8 +23,12 @@ import org.springframework.web.bind.annotation.RequestMethod; import java.io.IOException; import java.net.URISyntaxException; import java.nio.charset.Charset; +import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.HashSet; +import java.util.List; +import java.util.Map; import java.util.Set; import javax.annotation.Resource; @@ -34,7 +40,7 @@ import cn.yixblog.platform.http.HttpRequestResult; * Created by wangning on 05/01/2018. */ @SpringBootTest -@ActiveProfiles({ "local", "alipay", "wechat", "jd", "bestpay" }) +@ActiveProfiles({ "proxy", "alipay", "wechat", "jd", "bestpay" }) @RunWith(SpringRunner.class) public class CustomerImpressionImplTest { @Resource @@ -48,7 +54,8 @@ public class CustomerImpressionImplTest { private OrgMapper orgMapper; @Resource private MailGunClient mailGunClient; - + @Resource + private ClientConfigMapper clientConfigMapper; // @Test // public void redisQueue() { @@ -60,40 +67,39 @@ public class CustomerImpressionImplTest { // } // } -// @Test -// public void excel() { -// try { -// XSSFWorkbook workbook = new XSSFWorkbook(new FileInputStream(new File("/Users/wangning/Desktop/asd.xlsx"))); -// XSSFSheet sheet = workbook.getSheetAt(0); -// Iterator rowIterator = sheet.rowIterator(); -// Row row = null; -// Cell cell = null; -// while (rowIterator.hasNext()) { -// row = rowIterator.next(); -// cell = row.getCell(3); -// cell.setCellType(HSSFCell.CELL_TYPE_STRING); -// -// JSONObject client = clientMapper.findClientByMoniker(cell.getStringCellValue().trim()); -// if(client==null){ -// System.out.println(); -// continue; -// } -// JSONObject org = orgMapper.findOne(client.getIntValue("org_id")); -// if(org==null){ -// continue; -// } -// -// row.createCell(5).setCellValue(org.getString("name")); -// } -// -// OutputStream out = new FileOutputStream("/Users/wangning/Desktop/春节活动报名结果通知(包含BD名称).xlsx"); -// workbook.write(out); -// workbook.close(); -// } catch (IOException e) { -// e.printStackTrace(); -// } -// } - + // @Test + // public void excel() { + // try { + // XSSFWorkbook workbook = new XSSFWorkbook(new FileInputStream(new File("/Users/wangning/Desktop/asd.xlsx"))); + // XSSFSheet sheet = workbook.getSheetAt(0); + // Iterator rowIterator = sheet.rowIterator(); + // Row row = null; + // Cell cell = null; + // while (rowIterator.hasNext()) { + // row = rowIterator.next(); + // cell = row.getCell(3); + // cell.setCellType(HSSFCell.CELL_TYPE_STRING); + // + // JSONObject client = clientMapper.findClientByMoniker(cell.getStringCellValue().trim()); + // if(client==null){ + // System.out.println(); + // continue; + // } + // JSONObject org = orgMapper.findOne(client.getIntValue("org_id")); + // if(org==null){ + // continue; + // } + // + // row.createCell(5).setCellValue(org.getString("name")); + // } + // + // OutputStream out = new FileOutputStream("/Users/wangning/Desktop/春节活动报名结果通知(包含BD名称).xlsx"); + // workbook.write(out); + // workbook.close(); + // } catch (IOException e) { + // e.printStackTrace(); + // } + // } @Test public void sendSimpleMessage() throws Exception { @@ -126,7 +132,7 @@ public class CustomerImpressionImplTest { generator.addQueryString("ascending", "yes"); generator.addQueryString("v:my-custom-data", "123456789"); generator.addQueryString("limit", "12"); - System.out.println(String.valueOf(DateUtils.addDays(new Date(),1))); + System.out.println(String.valueOf(DateUtils.addDays(new Date(), 1))); HttpRequestResult res = null; try { res = generator.execute(); @@ -155,13 +161,15 @@ public class CustomerImpressionImplTest { public void sendSimpleMessages() throws Exception { SendMail sendMail = new SendMail(); sendMail.setFrom("info@mail.royalpay.com.au"); - sendMail.setContent("

Hi kira

"); + sendMail.setContent("

Hi

"); + List list = new ArrayList<>(); + list.add("testTag"); +// sendMail.setTags(list); Set mailCCs = new HashSet<>(); mailCCs.add("asd1159111@163.com"); sendMail.setMailCcs(mailCCs); Set mailtos = new HashSet<>(); mailtos.add("eason.qian@royalpay.com.au"); - mailtos.add("164851225@qq.com"); sendMail.setMailTos(mailtos); sendMail.setTitle("Final Test"); @@ -171,4 +179,43 @@ public class CustomerImpressionImplTest { System.out.println(result.toJSONString()); } + @Test + public void asd() { + JSONObject client = clientMapper.findClient(9); + 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"), + var); + } + + @Test + public void qwe() { + List clients = clientMapper.AllClients(); + List clientConfigs = clientConfigMapper.getAll(); + Map clientConfigMap = new HashMap<>(); + Map clientMap = new HashMap<>(); + clientConfigs.forEach(p -> { + clientConfigMap.put(p.getString("client_moniker"), p); + }); + clients.forEach(p -> { + clientMap.put(p.getString("client_moniker"), p); + }); + String split = "--"; + String cc = "cc:"; + String c = "c"; + clientConfigMap.values().forEach(p -> { + String clientMoniker = p.getString("client_moniker"); + JSONObject tmpClient = clientMap.get(clientMoniker); + tmpClient.keySet().forEach(o->{ + if(StringUtils.isNotEmpty(p.getString(o))){ + if(!tmpClient.getString(o).equals(p.getString(o))){ + System.out.println(clientMoniker+split+o+split+cc+p.getString(o)+split+c+tmpClient.getString(o)); + } + + } + }); + + }); + } } \ No newline at end of file