From 306c4b0ecccf10699af1edcd0aa3df784b63c6fe Mon Sep 17 00:00:00 2001 From: luoyang Date: Mon, 4 Nov 2019 16:43:31 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=87=AA=E5=8A=A9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/core/impls/SimpleClientApplyServiceImpl.java | 3 ++- .../manage/application/web/SimpleClientApplyController.java | 1 - .../payment/manage/merchants/core/impls/ClientManagerImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java index 4b4882373..53c1eb8f5 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java @@ -617,8 +617,10 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { sysClient.put("royalpayindustry", apply.getString("industry")); sysClient.put("alipayindustry", apply.getString("alipayindustry")); sysClient.put("industry", apply.getString("wechatindustry")); + sysClient.put("enable_wechat", 1); if (StringUtils.isBlank(apply.getString("wechatindustry"))) { sysClient.put("industry", 331); + sysClient.put("enable_wechat", 0); } sysClient.put("contact_person", apply.getString("contact_person")); sysClient.put("contact_job", apply.getString("contact_job")); @@ -646,7 +648,6 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { sysClient.put("country", "AUS"); sysClient.put("credential_code", RandomStringUtils.random(32, true, true)); sysClient.put("ali_sub_merchant_id", clientMoniker); - sysClient.put("enable_wechat", 1); clientMapper.save(sysClient); JSONObject representativeInfo = new JSONObject(); diff --git a/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java b/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java index 6b788af88..aa00e95e8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java +++ b/src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java @@ -84,7 +84,6 @@ public class SimpleClientApplyController { @PostMapping(value = "/clientCompliance/commit_aggregate_file") @ResponseBody public JSONObject getClientArregateFile(@RequestHeader("User-Agent") String userAgent,@RequestParam MultipartFile file, @RequestParam(value = "username") String username, @RequestParam(value = "clean_days") String clean_days) throws IOException { - //这个是上传合同的接口，现在为了测试方便，返回一个带合同url的JSONObject，需要传入username，clean_days，签名图片 JSONObject signInfo = new JSONObject(); signInfo.put("signature_ip", RequestEnvironment.getClientIp()); signInfo.put("user_agent", userAgent); 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 5fef1fd80..d61605c17 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 @@ -5295,7 +5295,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid JSONObject representativeInfo = sysClientLegalPersonMapper.findRepresentativeInfo(client.getIntValue("client_id")); 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)) { - throw new BadRequestException("The LegalPersonInfo is not config!"); + 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"))) ) {