fix 自助优化

master
luoyang 5 years ago
parent 8e12972f89
commit 306c4b0ecc

@ -617,8 +617,10 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
sysClient.put("royalpayindustry", apply.getString("industry")); sysClient.put("royalpayindustry", apply.getString("industry"));
sysClient.put("alipayindustry", apply.getString("alipayindustry")); sysClient.put("alipayindustry", apply.getString("alipayindustry"));
sysClient.put("industry", apply.getString("wechatindustry")); sysClient.put("industry", apply.getString("wechatindustry"));
sysClient.put("enable_wechat", 1);
if (StringUtils.isBlank(apply.getString("wechatindustry"))) { if (StringUtils.isBlank(apply.getString("wechatindustry"))) {
sysClient.put("industry", 331); sysClient.put("industry", 331);
sysClient.put("enable_wechat", 0);
} }
sysClient.put("contact_person", apply.getString("contact_person")); sysClient.put("contact_person", apply.getString("contact_person"));
sysClient.put("contact_job", apply.getString("contact_job")); sysClient.put("contact_job", apply.getString("contact_job"));
@ -646,7 +648,6 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
sysClient.put("country", "AUS"); sysClient.put("country", "AUS");
sysClient.put("credential_code", RandomStringUtils.random(32, true, true)); sysClient.put("credential_code", RandomStringUtils.random(32, true, true));
sysClient.put("ali_sub_merchant_id", clientMoniker); sysClient.put("ali_sub_merchant_id", clientMoniker);
sysClient.put("enable_wechat", 1);
clientMapper.save(sysClient); clientMapper.save(sysClient);
JSONObject representativeInfo = new JSONObject(); JSONObject representativeInfo = new JSONObject();

@ -84,7 +84,6 @@ public class SimpleClientApplyController {
@PostMapping(value = "/clientCompliance/commit_aggregate_file") @PostMapping(value = "/clientCompliance/commit_aggregate_file")
@ResponseBody @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 { 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需要传入usernameclean_days签名图片
JSONObject signInfo = new JSONObject(); JSONObject signInfo = new JSONObject();
signInfo.put("signature_ip", RequestEnvironment.getClientIp()); signInfo.put("signature_ip", RequestEnvironment.getClientIp());
signInfo.put("user_agent", userAgent); signInfo.put("user_agent", userAgent);

@ -5295,7 +5295,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
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!"); 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"))) ) {

Loading…
Cancel
Save