Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/db/modify.sql

src/db/modify.sql

@@ -553,8 +553,6 @@ ADD COLUMN `gateway_alipay_online`  tinyint(1) NULL DEFAULT 1 COMMENT '支付宝
 
 alter table pmt_refunds add column remark varchar(200);
 
-alter table pmt_refunds add column remark varchar(200);
-
 alter table sys_client_pre_apply add column `salt` varchar(30) NOT NULL COMMENT '每次修改密码时随机更改';
 alter table sys_client_pre_apply add column `password_hash` varchar(150) NOT NULL COMMENT '登录账户密码 base64(sha256(salt+password))';
 alter table sys_client_pre_apply add column  `password_aes` varchar(50) NOT NULL COMMENT '登录账户密码 AES加密';

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

@@ -421,20 +421,23 @@ public class RetailAppServiceImp implements RetailAppService {
     public JSONObject getClientInfo(JSONObject device) {
         String clientType = device.getString("client_type");
         deviceSupport.findRegister(clientType);
-        JSONObject clientWithConfig = clientManager.getClientInfo(device.getIntValue("client_id"));
+        JSONObject clientWithConfig = clientMapper.findClient(device.getIntValue("client_id"));
         clientWithConfig.putAll(clientConfigService.find(device.getIntValue("client_id")));
         JSONObject res = SignInAccountServiceImpl.clientInfoWithNoSecretInfo(clientWithConfig);
         res.put("is_skip_clearing", res.getBoolean("skip_clearing"));
         if (clientType.equals("iphone")) {
             res.put("skip_clearing", !res.getBoolean("skip_clearing"));
         }
-
+        if("4".equals(clientWithConfig.getString("source"))) {
-        if(StringUtils.isEmpty(clientWithConfig.getString("business_structure"))||
+            res.put("refuse_remark", clientWithConfig.getString("refuse_remark"));
-                StringUtils.isEmpty(clientWithConfig.getString("logo_url"))||
+            res.put("base_info_lack", false);
+            res.put("compliance_info_lack", false);
+            if (StringUtils.isEmpty(clientWithConfig.getString("business_structure")) ||
+                    StringUtils.isEmpty(clientWithConfig.getString("logo_url")) ||
                     StringUtils.isEmpty(clientWithConfig.getString("description")) ||
-                ("Company".equals(clientWithConfig.getString("business_structure")) && StringUtils.isEmpty(clientWithConfig.getString("acn")))||
+                    ("Company".equals(clientWithConfig.getString("business_structure")) && StringUtils.isEmpty(clientWithConfig.getString("acn"))) ||
-                (!"Company".equals(clientWithConfig.getString("business_structure")) && StringUtils.isEmpty(clientWithConfig.getString("abn")))||
+                    (!"Company".equals(clientWithConfig.getString("business_structure")) && StringUtils.isEmpty(clientWithConfig.getString("abn"))) ||
-                (StringUtils.isEmpty(clientWithConfig.getString("company_website")) && StringUtils.isEmpty(clientWithConfig.getString("company_photo")) &&StringUtils.isEmpty(clientWithConfig.getString("store_photo")))) {
+                    (StringUtils.isEmpty(clientWithConfig.getString("company_website")) && StringUtils.isEmpty(clientWithConfig.getString("company_photo")) && StringUtils.isEmpty(clientWithConfig.getString("store_photo")))) {
                 res.put("base_info_lack", true);
 
             }
@@ -444,6 +447,7 @@ public class RetailAppServiceImp implements RetailAppService {
                     res.put("compliance_info_lack", true);
                 }
             }
+        }
         return res;
     }
 

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

@@ -21,6 +21,7 @@ public class ClientPreApplyStep1Bean {
     private String contact_email;
     @NotEmpty(message = "phoneCodeKey can't be null")
     private String phoneCodeKey;
+    private String apply_source = "pc";
 
 
     public JSONObject insertObject() {
@@ -75,4 +76,12 @@ public class ClientPreApplyStep1Bean {
     public void setPhoneCodeKey(String phoneCodeKey) {
         this.phoneCodeKey = phoneCodeKey;
     }
+
+    public String getApply_source() {
+        return apply_source;
+    }
+
+    public void setApply_source(String apply_source) {
+        this.apply_source = apply_source;
+    }
 }