add 自助进件优化

src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java

@@ -72,6 +72,7 @@ public class ClientPreApplyBean {
     private String alipayindustry;
     private String wechatindustry;
     private String store_photo;
+    private String contract_url;
 
     public JSONObject insertObject() {
         JSONObject res = (JSONObject) JSON.toJSON(this);
@@ -389,4 +390,12 @@ public class ClientPreApplyBean {
     public void setWechatindustry(String wechatindustry) {
         this.wechatindustry = wechatindustry;
     }
+
+    public void setContract_url(String contract_url) {
+        this.contract_url = contract_url;
+    }
+
+    public String getContract_url() {
+        return contract_url;
+    }
 }

src/main/java/au/com/royalpay/payment/manage/application/core/SimpleClientApplyService.java

@@ -42,7 +42,7 @@ public interface SimpleClientApplyService {
 
     JSONObject getSourceAggregateFile(String username ,String clean_days);
 
-    JSONObject getClientAggregateFile(String username, MultipartFile file,String clean_days) throws IOException;
+    JSONObject getClientAggregateFile(String username, MultipartFile file,String clean_days, JSONObject signInfo) throws IOException;
 
     JSONObject getPreApplyInfoForAggree(String username ,String clean_days);
 

src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java

@@ -49,6 +49,7 @@ import java.awt.image.BufferedImage;
 import java.io.*;
 import java.math.BigDecimal;
 import java.net.URISyntaxException;
+import java.net.URLDecoder;
 import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -405,10 +406,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
             applyInfo.put("update_time", new Date());
             sysClientPreMapperMapper.update(applyInfo);
             if (applyInfo.getBooleanValue("agree")) {
-                if(apply.getString("contract_url")==null|| !(StringUtils.equals(apply.getString("clean_days"),applyInfo.getString("clean_days"))) ) {
+                applyerToClient(username, null);
-                    throw new BadRequestException("The date of liquidation has changed and the contract needs to be renewed");
-                }
-                applyerToClient(username);
             }
         }
     }
@@ -518,10 +516,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         apply.put("clean_days", clean_days);
         JSONObject sysConfig = sysConfigManager.getSysConfig();
         JSONObject test = JSONObject.parseObject(sysConfig.getString("sys_apply_rates"));
-
         JSONObject rate = test.getJSONObject("t"+clean_days.trim());
-
-
         apply.put("wechat_rate",rate.getString("Wechat"));
         apply.put("alipay_rate",rate.getString("Alipay"));
         apply.put("alipay_online_rate",rate.getString("AlipayOnline"));
@@ -551,18 +546,18 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
 
 
     @Override
-    public JSONObject getClientAggregateFile(String username, MultipartFile file ,String clean_days) throws IOException{
+    public JSONObject getClientAggregateFile(String username, MultipartFile file ,String clean_days, JSONObject signInfo) throws IOException{
         JSONObject apply = getPreApplyInfoForAggree(username ,clean_days);
-        apply.put("full_name", file.getOriginalFilename());
+        apply.put("full_name", URLDecoder.decode(file.getOriginalFilename(),"UTF-8"));
         BufferedImage img = ImageIO.read(file.getInputStream());
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         ImageIO.write(img, "png", out);
         apply.put("img","data:image/png;base64," + Base64.encodeBase64String(out.toByteArray()));
 
-        return exportImgAggregateFile(username, apply);
+        return exportImgAggregateFile(username, apply, signInfo);
     }
 
-    private JSONObject exportImgAggregateFile(String username, JSONObject apply) throws IOException{
+    private JSONObject exportImgAggregateFile(String username, JSONObject apply, JSONObject signInfo) throws IOException {
         InputStream stream = null;
         JSONObject contractInfo = new JSONObject();
         try {
@@ -575,17 +570,23 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
             JSONObject fileInfo = attachmentClient.uploadFile(stream, username + "_" + System.currentTimeMillis() + "_agreement.pdf", false);
 
             contractInfo.put("contract_url", fileInfo.getString("url"));
+            apply.put("contract_url", contractInfo.getString("contract_url"));
+            signInfo.put("contract_url", contractInfo.getString("contract_url"));
+            apply.put("agree", true);
+            apply.put("update_time", new Date());
+            sysClientPreMapperMapper.update(apply);
         } catch (Exception e) {
             logger.error("合同制作出现问题：", e);
             throw new BadRequestException("合同制作出现问题：" + e.getMessage());
         } finally {
             stream.close();
         }
+        applyerToClient(apply.getString("username"), signInfo);
         return contractInfo;
     }
 
     //todo
-    private void applyerToClient(String username) {
+    private void applyerToClient(String username, JSONObject signInfo) {
         JSONObject sysConfig = sysConfigManager.getSysConfig();
         String arr[] = sysConfig.getString("temp_sub_mch_id").split(",");
         List<String> availableMerchants = WechatPayEnvironment.getEnv().getWechatMerchantConfigs().stream()
@@ -612,9 +613,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
             throw new ForbiddenException("The user name has been registered");
         }
         String clientMoniker = generateClientMoniker();
-
         JSONObject sysClient = new JSONObject();
-
         JSONObject followBd = managerMapper.findByLoginId("customerservice");
 
         sysClient.put("bd_user", followBd.getString("manager_id"));
@@ -626,14 +625,15 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         sysClient.put("suburb", apply.getString("suburb"));
         sysClient.put("state", apply.getString("state"));
         sysClient.put("postcode", apply.getString("postcode"));
-        sysClient.put("royalpayindustry", apply.getString("royalpayindustry"));
+        sysClient.put("royalpayindustry", apply.getString("industry"));
         sysClient.put("alipayindustry", apply.getString("alipayindustry"));
-        sysClient.put("industry", apply.getString("industry"));//微信支付行业
+        sysClient.put("industry", apply.getString("wechatindustry"));
         sysClient.put("contact_person", apply.getString("contact_person"));
         sysClient.put("contact_job", apply.getString("contact_job"));
         sysClient.put("logo_url", apply.getString("logo_url"));
         sysClient.put("company_website", apply.getString("company_website"));
         sysClient.put("company_photo", apply.getString("company_photo"));
+        sysClient.put("store_photo", apply.getString("store_photo"));
         sysClient.put("contact_email", apply.getString("contact_email"));
         sysClient.put("contact_phone", "+61" + apply.getString("contact_phone"));
         sysClient.put("company_phone", apply.getString("company_phone"));
@@ -654,19 +654,9 @@ 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 fileJson = new JSONObject();
-        fileJson.put("client_id", sysClient.getString("client_id"));
-        fileJson.put("last_update_date", new Date());
-        //fileJson.put("last_update_by", manager.getString("display_name"));
-        fileJson.put("file_name", CLIENT_AGREE_FILE);
-        fileJson.put("file_value", apply.getString("contract_url"));
-        fileJson.put("status", 0);
-        fileJson.put("is_valid", 1);
-        clientFilesMapper.save(fileJson);
-
         JSONObject representativeInfo = new JSONObject();
         representativeInfo.put("client_id", sysClient.getIntValue("client_id"));
         representativeInfo.put("representative_person", apply.getString("representative_person"));
@@ -706,6 +696,22 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         sysAccount.put("nation_code", "+61");
         clientAccountMapper.save(sysAccount);
 
+        if (signInfo != null) {
+            JSONObject fileJson = new JSONObject();
+            fileJson.put("client_id", sysClient.getString("client_id"));
+            fileJson.put("last_update_date", new Date());
+            //fileJson.put("last_update_by", manager.getString("display_name"));
+            fileJson.put("file_name", CLIENT_AGREE_FILE);
+            fileJson.put("file_value", signInfo.getString("contract_url"));
+            fileJson.put("status", 1);
+            fileJson.put("signature_time", new Date());
+            fileJson.put("signature_ip", signInfo.getString("signature_ip"));
+            fileJson.put("user_agent", signInfo.getString("user_agent"));
+            fileJson.put("signature_account_id", sysAccount.getString("account_id"));
+            fileJson.put("is_valid", 1);
+            clientFilesMapper.save(fileJson);
+        }
+
         JSONObject sysBank = new JSONObject();
         sysBank.put("client_id", clientId);
         sysBank.put("account_no", apply.getString("bank_no"));
@@ -724,6 +730,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         JSONObject clientConfig = new JSONObject();
         clientConfig.put("client_id", clientId);
         clientConfig.put("skip_clearing", 1);
+        clientConfig.put("enable_wechat", 1);
         clientConfig.put("client_moniker", clientMoniker);
         clientConfig.put("clean_days", apply.getIntValue("clean_days"));
         clientConfig.put("common_sub_merchant_id", 1);
@@ -765,10 +772,16 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         configNewClientRate(sysRate, clientId, "AlipayOnline", "AlipayOnline");
         configNewClientRate(sysRate, clientId, "Bestpay", "Bestpay");
         configNewClientRate(sysRate, clientId, "jd", "JDpay");
+        configNewClientRate(sysRate, clientId, "CB_BankPay", "CB_Bankpay");
         Runnable task2 = () -> {
             try {
+                if (signInfo != null) {
+                    clientManager.registerClientApplyGMS(clientMoniker, sysAccount.getString("account_id"));
+                }else {
                     clientManager.getNewAggregateAgreeFile(clientMoniker, null, true);
+                }
             } catch (Exception ignore) {
+                logger.error("{}自助申请成功，支付宝报备失败：{}",clientMoniker,ignore);
             }
         };
         pool.execute(task2);

src/main/java/au/com/royalpay/payment/manage/application/web/ContentController.java

@@ -45,7 +45,6 @@ public class ContentController {
         model.addAttribute("bestpay_rate", contractInfo.getString("bestpay_rate"));
         model.addAttribute("alipay_rate", contractInfo.getString("alipay_rate"));
         model.addAttribute("jd_rate", contractInfo.getString("jd_rate"));
-
         return "contract_for_compliance";
     }
 

src/main/java/au/com/royalpay/payment/manage/application/web/SimpleClientApplyController.java

@@ -5,6 +5,7 @@ import au.com.royalpay.payment.manage.application.beans.ClientPreApplyStep1Bean;
 import au.com.royalpay.payment.manage.application.core.SimpleClientApplyService;
 import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.connections.attachment.core.AttachmentClient;
+import au.com.royalpay.payment.tools.env.RequestEnvironment;
 import au.com.royalpay.payment.tools.env.SysConfigManager;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -82,9 +83,12 @@ public class SimpleClientApplyController {
 
     @PostMapping(value = "/clientCompliance/commit_aggregate_file")
     @ResponseBody
-    public JSONObject getClientArregateFile(@RequestParam MultipartFile file, @RequestParam String username, @RequestParam 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，需要传入username，clean_days，签名图片
-        return simpleClientApplyService.getClientAggregateFile(username, file, clean_days);
+        JSONObject signInfo = new JSONObject();
+        signInfo.put("signature_ip", RequestEnvironment.getClientIp());
+        signInfo.put("user_agent", userAgent);
+        return simpleClientApplyService.getClientAggregateFile(username, file, clean_days, signInfo);
     }
 
     @GetMapping("/client/source_aggregate_file")

src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java

@@ -370,6 +370,8 @@ public interface ClientManager {
 
     void registerAlipayOnlineGms(String clientMoniker, JSONObject manager);
 
+    void registerClientApplyGMS(String clientMoniker, String account_id);
+
     String queryAlipayGmsStatus(String clientMoniker, JSONObject manager);
 
     JSONObject queryAlipayGmsJson(String clientMoniker, JSONObject manager);

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -121,6 +121,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.URLDecoder;
 import java.security.*;
 import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
@@ -1566,7 +1567,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     private void checkPhoneAndWechatExist(NewAccountBean account) {
         if (clientAccountMapper.findByPhone(account.getContactPhone(), "+" + account.getNation_code()) != null) {
             throw new BadRequestException("Mobile phone number has been bound to other accounts");
-        };
+        }
+        ;
     }
 
     @Override
@@ -3600,7 +3602,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         Date endDate = TimeZoneUtils.nextYearByCurrDay();
         String end_date = DateFormatUtils.format(endDate, "dd/MM/yyyy");
         client.put("end_date", end_date);
-        client.put("full_name", file.getOriginalFilename());
+        client.put("full_name", URLDecoder.decode(file.getOriginalFilename(),"UTF-8"));
         BufferedImage img = ImageIO.read(file.getInputStream());
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         ImageIO.write(img, "png", out);
@@ -4795,18 +4797,12 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (client == null) {
             throw new InvalidShortIdException();
         }
-        checkOrgPermission(manager, client);
         if (!client.containsKey("store_photo") || !client.containsKey("company_photo")) {
             throw new InvalidParameterException("store photo cannot be empty ");
         }
-        JSONObject client_bank = getBankAccountByClientId(client.getIntValue("client_id"));
-        if (client_bank == null || client_bank.size() <= 0) {
-            throw new BadRequestException("The Partner's Account is not config!");
-        }
-        client.put("bank_id", client_bank.getString("account_no"));
 
         if (StringUtils.isBlank(client.getString("business_structure"))) {
-            throw new BadRequestException("Business Structure can't be null");
+            client.put("business_structure", "Registered body(Sole Trader)");
         }
 
         if (StringUtils.isBlank(client.getString("alipayindustry"))) {
@@ -4926,24 +4922,17 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (client == null) {
             throw new InvalidShortIdException();
         }
-        checkOrgPermission(manager, client);
         if (!client.containsKey("company_website")) {
             throw new InvalidParameterException("Website cannot be empty ");
         }
         if (StringUtils.isBlank(client.getString("business_structure"))) {
-            throw new BadRequestException("Business Structure can't be null");
+            client.put("business_structure", "Registered body(Sole Trader)");
         }
 
         if (StringUtils.isBlank(client.getString("alipayindustry"))) {
             throw new BadRequestException("Alipay Industry can't be null");
         }
 
-        JSONObject client_bank = getBankAccountByClientId(client.getIntValue("client_id"));
-        if (client_bank == null || client_bank.size() <= 0) {
-            throw new BadRequestException("The Partner's Account is not config!");
-        }
-        client.put("bank_id", client_bank.getString("account_no"));
-
         AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant();
         Element resultElement = alipayClient.registerOnlineGmsPortal(mch.getPid(), client);
         if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) {
@@ -4960,12 +4949,36 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     }
 
     @Override
+    public void registerClientApplyGMS(String clientMoniker, String accountId) {
+        JSONObject client = getClientInfoByMoniker(clientMoniker);
+        if (client == null) {
+            throw new InvalidShortIdException();
+        }
+        JSONObject clientConfig = merchantInfoProvider.getClientConfigInfoByMoniker(clientMoniker);
+        JSONObject account = clientAccountMapper.findById(accountId);
+        if (clientConfig == null) {
+            throw new InvalidShortIdException();
+        }
+        if (StringUtils.isNotBlank(clientConfig.getString("client_pay_type"))) {
+            String[] payType = clientConfig.getString("client_pay_type").split(",");
+            if (Arrays.asList(payType).contains("1")) {
+                registerAlipayOnlineGms(clientMoniker, null);
+                switchChannelPermission(account, clientMoniker, "Alipay", true);
+            }
+            if (Arrays.asList(payType).contains("2")) {
+                registerAlipayGms(clientMoniker, null);
+                enableGatewayAlipayOnline(account, clientMoniker, true);
+            }
+        }
+    }
+
+    @Override
+
     public String queryAlipayOnlineGmsStatus(String clientMoniker, JSONObject manager) {
         JSONObject client = getClientInfoByMoniker(clientMoniker);
         if (client == null) {
             throw new InvalidShortIdException();
         }
-        checkOrgPermission(manager, client);
         AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant();
         Element resultElement = alipayClient.queryOnlineGmsPortalStatus(mch.getPid(), client);
         if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) {

src/main/ui/merchant_application.html

@@ -370,22 +370,6 @@
                                    placeholder="Company Name" required  maxlength="80">
                         </div>
 
-                        <div class="form-group">
-                            <label class="control-label col-sm-2">* Logo</label>
-                            <div class="col-sm-8">
-                                <div class="form-control-static">
-                                    <button class="btn btn-success" type="button"
-                                            ngf-select="uploadLogo($file)"
-                                            accept="image/*">
-                                        <i class="fa fa-upload"></i> Upload Logo
-                                    </button>
-                                </div>
-                                <uib-progressbar value="logoProgress.value"
-                                                 ng-if="logoProgress"></uib-progressbar>
-                                <img ng-src="{{partner.logo_url}}" ng-if="partner.logo_url" style="height: 100px;">
-                            </div>
-                        </div>
-
                         <div class="form-group has-feedback"
                              ng-class="{'has-error':companyForm.abn.$invalid && companyForm.abn.$dirty}">
                             <input class="form-control" ng-model="partner.abn" placeholder="ABN"
@@ -426,78 +410,6 @@
                             <input class="form-control" ng-model="partner.postcode" placeholder="Postcode" required
                                    maxlength="10" name="postcode">
                         </div>
-
-                        <div class="form-group has-feedback"
-                             ng-class="{'has-error':companyForm.contact_job.$invalid && companyForm.contact_job.$dirty}">
-                            <input class="form-control" ng-model="partner.contact_job" placeholder="Your Job Title"
-                                   required maxlength="50" name="contact_job">
-                        </div>
-
-                        <div class="panel panel-default">
-                            <div class="panel-heading">Legal person information</div>
-                            <div class="panel-body">
-                                <div class="form-group has-feedback"
-                                     ng-class="{'has-error':companyForm.representative_person.$invalid && companyForm.representative_person.$dirty}">
-                                    <input class="form-control" ng-model="partner.representative_person" placeholder="Representative Person Name"
-                                           required maxlength="50" name="contact_person">
-                                </div>
-                                <div class="form-group col-xs-12"
-                                     ng-class="{'has-error':companyForm.representative_phone.$invalid && companyForm.representative_phone.$dirty}">
-                                    <div class="input-group">
-                                        <span class="input-group-addon">{{partner.nation_code}}</span>
-                                        <input type="text" name="representative_phone" required ng-model="partner.representative_phone"
-                                               class="form-control" style="display: inline" onkeyup="value=value.replace(/[^\d]/g,'')"
-                                               placeholder="Representative Person Phone"  maxlength="11">
-                                    </div>
-                                </div>
-                                <div class="form-group has-feedback"
-                                     ng-class="{'has-error':companyForm.representative_email.$invalid && companyForm.representative_email.$dirty}">
-                                    <input type="email" class="form-control" ng-model="partner.representative_email" placeholder="Representative Email address"
-                                           required maxlength="50" name="contact_email" ng-mouseleave="checkParams()" ng-mousedown="trueEmail =false">
-                                    <div style="text-align: left" ng-if="trueEmail">
-                                        <p style="text-align: left;font-size: 12px;color: red">The mailbox is incorrect</p>
-                                    </div>
-                                </div>
-                                <div class="form-group has-feedback"
-                                     ng-class="{'has-error':companyForm.representative_job_title.$invalid && companyForm.representative_job_title.$dirty}">
-                                    <input class="form-control" ng-model="partner.representative_job_title" placeholder="Representative Person Job Title"
-                                           required maxlength="50" name="representative_job_title">
-                                </div>
-                                <label><input type="checkbox" ng-click="samePerson()">I'm the legal person.</label>
-                            </div>
-                        </div>
-
-                        <div class="panel panel-default">
-                            <div class="panel-heading">Registered Address</div>
-                            <div class="panel-body">
-                                <div class="form-group has-feedback"
-                                     ng-class="{'has-error':companyForm.registered_address.$invalid && companyForm.registered_address.$dirty}">
-                                    <textarea class="form-control" ng-model="partner.registered_address" placeholder="Registered Address"
-                                              name="registered_address" required maxlength="200"></textarea>
-                                </div>
-                                <div class="form-group has-feedback"
-                                     ng-class="{'has-error':companyForm.registered_suburb.$invalid && companyForm.registered_suburb.$dirty}">
-                                    <input class="form-control" ng-model="partner.registered_suburb" placeholder="Registered Suburb" required
-                                           maxlength="50" name="registered_suburb">
-                                </div>
-                                <div class="form-group has-feedback"
-                                     ng-class="{'has-error':companyForm.registered_state.$invalid && companyForm.registered_state.$dirty}">
-                                    <select class="form-control" name="registered_state"
-                                            ng-model="partner.registered_state"  maxlength="20"
-                                            id="registered_state-input" required
-                                            ng-options="state.value as state.label for state in states">
-                                        <option value="">Registered State</option>
-                                    </select>
-                                </div>
-                                <div class="form-group has-feedback"
-                                     ng-class="{'has-error':companyForm.registered_postcode.$invalid && companyForm.registered_postcode.$dirty}">
-                                    <input class="form-control" ng-model="partner.registered_postcode" placeholder="Registered Postcode" required
-                                           maxlength="10" name="registered_postcode">
-                                </div>
-                                <label><input type="checkbox" ng-click="sameAddress()"> Registered Office Address Same As Trading Address.</label>
-                            </div>
-                        </div>
-
                         <div class="row">
                             <div class="col-xs-12 margin-bottom">
                                 <div class="form-group has-feedback" ng-class="{'has-error':companyForm.royalpayindustry.$invalid && companyForm.royalpayindustry.$dirty}">
@@ -933,7 +845,6 @@
                     </div>
                 </div>
             </div>
-
         </div>
         <section class="section section-six fp-auto-height footer">
             <div class="container">