From c56773120d464f22bf726fa300c79984d6fc75d9 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Fri, 25 May 2018 18:00:44 +0800
Subject: [PATCH] update

---
 .../manage/application/beans/ClientPreApplyBean.java     | 9 ++++++++-
 .../core/impls/SimpleClientApplyServiceImpl.java         | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

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 f619c9860..d00e8e90a 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
@@ -6,6 +6,9 @@ import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.NotEmpty;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Created by yuan on 2018/5/23.
  */
@@ -52,11 +55,15 @@ public class ClientPreApplyBean {
 
     public JSONObject insertObject() {
         JSONObject res = (JSONObject) JSON.toJSON(this);
+        List<String> keys = new ArrayList<>();
         res.keySet().forEach(p-> {
             if (StringUtils.isEmpty(res.getString(p).trim())) {
-                res.remove(p);
+                keys.add(p);
             }
         });
+        keys.forEach(p->{
+            res.remove(p);
+        });
         return res;
     }
     public String getCompany_name() {
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 a0a5279b2..cf9978445 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
@@ -144,6 +144,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         try {
             ssender.sendWithParam(nationCode, phoneNumber, REGISTER_CLIENT_TEMPLID, param, "RoyalPay", "", ""); //
         } catch (Exception e) {
+            e.printStackTrace();
             throw new ServerErrorException("System Error");
         }
         stringRedisTemplate.boundValueOps(getRegisterClientRedisKey(phoneNumber)).set(registerClientCode, Long.parseLong(expireMin), TimeUnit.MINUTES);
@@ -262,6 +263,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         sysClient.put("source",4);
         sysClient.put("approve_result",2);
         sysClient.put("creator",0);
+        sysClient.put("industry",331);
         sysClient.put("merchant_id",subMerchantId.getString("merchant_id"));
         sysClient.put("sub_merchant_id",subMerchantId.getString("sub_merchant_id"));
         sysClient.put("common_sub_merchant_id",1);