msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add 自助进件调整

Browse Source
master
luoyang 5 years ago
parent bec879cf56
commit b533845741
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>1.2.61</version> <version>1.2.62</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

13
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -522,6 +522,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
@Override @Override
public void exportClients(JSONObject manager, PartnerQuery query, HttpServletResponse resp) { public void exportClients(JSONObject manager, PartnerQuery query, HttpServletResponse resp) {
JSONObject params = prepareListClientsParameter(manager, query); JSONObject params = prepareListClientsParameter(manager, query);
logger.info("exporting_clients:--->{}", params);
JSONObject retResp = serverlessFunctionTrigger.triggerFunction("export_merchants", params); JSONObject retResp = serverlessFunctionTrigger.triggerFunction("export_merchants", params);
String contentB64 = retResp.getString("content"); String contentB64 = retResp.getString("content");
resp.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); resp.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
@ -3615,7 +3616,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
Date endDate = TimeZoneUtils.nextYearByCurrDay(); Date endDate = TimeZoneUtils.nextYearByCurrDay();
String end_date = DateFormatUtils.format(endDate, "dd/MM/yyyy"); String end_date = DateFormatUtils.format(endDate, "dd/MM/yyyy");
client.put("end_date", end_date); client.put("end_date", end_date);
client.put("full_name", URLDecoder.decode(file.getOriginalFilename(),"UTF-8")); client.put("full_name", URLDecoder.decode(file.getOriginalFilename(), "UTF-8"));
BufferedImage img = ImageIO.read(file.getInputStream()); BufferedImage img = ImageIO.read(file.getInputStream());
ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream();
ImageIO.write(img, "png", out); ImageIO.write(img, "png", out);
@ -4976,11 +4977,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
String[] payType = clientConfig.getString("client_pay_type").split(","); String[] payType = clientConfig.getString("client_pay_type").split(",");
if (Arrays.asList(payType).contains("1")) { if (Arrays.asList(payType).contains("1")) {
registerAlipayOnlineGms(clientMoniker, null); registerAlipayOnlineGms(clientMoniker, null);
switchChannelPermission(account, clientMoniker, "Alipay", true); enableGatewayAlipayOnline(account, clientMoniker, true);
} }
if (Arrays.asList(payType).contains("2")) { if (Arrays.asList(payType).contains("2")) {
registerAlipayGms(clientMoniker, null); registerAlipayGms(clientMoniker, null);
enableGatewayAlipayOnline(account, clientMoniker, true); switchChannelPermission(account, clientMoniker, "Alipay", true);
} }
} }
} }
@ -5293,12 +5294,12 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
throw new BadRequestException("The Partner's Bank Account is not config!"); throw new BadRequestException("The Partner's Bank Account is not config!");
} }
JSONObject representativeInfo = sysClientLegalPersonMapper.findRepresentativeInfo(client.getIntValue("client_id")); JSONObject representativeInfo = sysClientLegalPersonMapper.findRepresentativeInfo(client.getIntValue("client_id"));
for(String str:representativeInfo.keySet()){ for (String str : representativeInfo.keySet()) {
if(representativeInfo.getString(str) == null || !(representativeInfo.getString(str).length()>0)|| !(client.getString("contact_job")!=null && client.getString("contact_job").length()>0)) { if (representativeInfo.getString(str) == null || !(representativeInfo.getString(str).length() > 0) || !(client.getString("contact_job") != null && client.getString("contact_job").length() > 0)) {
throw new BadRequestException("The LegalPersonInfo is not config!Please upgrade the RoyalPay App version"); throw new BadRequestException("The LegalPersonInfo is not config!Please upgrade the RoyalPay App version");
} }
} }
if ( !(StringUtils.isNotBlank(client.getString("client_pay_type"))) || !(StringUtils.isNotBlank(client.getString("client_pay_desc"))) ) { if (!(StringUtils.isNotBlank(client.getString("client_pay_type"))) || !(StringUtils.isNotBlank(client.getString("client_pay_desc")))) {
throw new BadRequestException("Merchant Payment Scenario is not config!"); throw new BadRequestException("Merchant Payment Scenario is not config!");
} }

Write Preview
Loading…
Cancel
Save