From 3546e8e3b774de9448a12f7ff5d11a31ea4d5eeb Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 4 Nov 2019 10:29:32 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=87=AA=E5=8A=A9=E8=BF=9B=E4=BB=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/beans/ClientPreApplyBean.java | 45 +++++++++++++++++++
 .../impls/SimpleClientApplyServiceImpl.java   |  4 ++
 2 files changed, 49 insertions(+)

diff --git a/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java b/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java
index d51a6becd..84d814bea 100644
--- a/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java
+++ b/src/main/java/au/com/royalpay/payment/manage/application/beans/ClientPreApplyBean.java
@@ -56,6 +56,11 @@ public class ClientPreApplyBean {
     private String nation_code;
     private String client_pay_type = "2";
     private String client_pay_desc = "201";
+    private String company_website;
+    private String company_photo;
+    private String alipayindustry;
+    private String wechatindustry;
+    private String store_photo;
 
 
 
@@ -255,4 +260,44 @@ public class ClientPreApplyBean {
     public String getClient_pay_desc() {
         return client_pay_desc;
     }
+
+    public void setAlipayindustry(String alipayindustry) {
+        this.alipayindustry = alipayindustry;
+    }
+
+    public void setCompany_photo(String company_photo) {
+        this.company_photo = company_photo;
+    }
+
+    public void setCompany_website(String company_website) {
+        this.company_website = company_website;
+    }
+
+    public void setStore_photo(String store_photo) {
+        this.store_photo = store_photo;
+    }
+
+    public void setWechatindustry(String wechatindustry) {
+        this.wechatindustry = wechatindustry;
+    }
+
+    public String getAlipayindustry() {
+        return alipayindustry;
+    }
+
+    public String getCompany_photo() {
+        return company_photo;
+    }
+
+    public String getCompany_website() {
+        return company_website;
+    }
+
+    public String getStore_photo() {
+        return store_photo;
+    }
+
+    public String getWechatindustry() {
+        return wechatindustry;
+    }
 }
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 947de6845..7359887ce 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
@@ -477,6 +477,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
                 data.add(rate);
             }
             JSONObject temp = new JSONObject();
+            data = data.stream().sorted((log1, log2) -> log1.getString("channel").compareTo(log2.getString("channel"))).collect(Collectors.toList());
             temp.put("data",data);
             temp.put("name",tName.getString(strt));
             rates.add(temp);
@@ -628,6 +629,9 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         sysClient.put("royalpayindustry", apply.getString("industry"));
         sysClient.put("alipayindustry", apply.getString("alipayindustry"));
         sysClient.put("industry", apply.getString("wechatindustry"));
+        if (StringUtils.isBlank(apply.getString("wechatindustry"))) {
+            sysClient.put("industry", 331);
+        }
         sysClient.put("contact_person", apply.getString("contact_person"));
         sysClient.put("contact_job", apply.getString("contact_job"));
         sysClient.put("logo_url", apply.getString("logo_url"));