Merge branch 'develop'

# Conflicts:
#	src/db/modify.sql

src/db/modify.sql

@@ -553,6 +553,8 @@ 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

@@ -428,6 +428,22 @@ public class RetailAppServiceImp implements RetailAppService {
         if (clientType.equals("iphone")) {
             res.put("skip_clearing", !res.getBoolean("skip_clearing"));
         }
+
+        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("abn")))||
+                (StringUtils.isEmpty(clientWithConfig.getString("company_website")) && StringUtils.isEmpty(clientWithConfig.getString("company_photo")) &&StringUtils.isEmpty(clientWithConfig.getString("store_photo")))) {
+            res.put("base_info_lack", true);
+
+        }
+        JSONObject file = clientManager.getAuthFiles(null, clientWithConfig.getString("client_moniker"));
+        for (String s : fileName) {
+            if (file.getString(s) == null) {
+                res.put("compliance_info_lack", true);
+            }
+        }
         return res;
     }