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 8f2f4c2be..c882890f0 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 @@ -53,6 +53,11 @@ public class ClientPreApplyBean { private String codeKey; private boolean agree; private String nation_code; + @NotEmpty(message = "Merchant Payment Scenario Type can't be null") + private String client_pay_type; + @NotEmpty(message = "Merchant Payment Scenario Desc can't be null") + private String client_pay_desc; + public JSONObject insertObject() { JSONObject res = (JSONObject) JSON.toJSON(this); @@ -234,4 +239,20 @@ public class ClientPreApplyBean { public void setNation_code(String nation_code) { this.nation_code = nation_code; } + + public void setClient_pay_type(String client_pay_type) { + this.client_pay_type = client_pay_type; + } + + public void setClient_pay_desc(String client_pay_desc) { + this.client_pay_desc = client_pay_desc; + } + + public String getClient_pay_type() { + return client_pay_type; + } + + public String getClient_pay_desc() { + return client_pay_desc; + } } 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 eda1415b7..e61854e5f 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 @@ -378,6 +378,10 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService { clientConfig.put("client_moniker", clientMoniker); clientConfig.put("clean_days", apply.getIntValue("clean_days")); clientConfig.put("common_sub_merchant_id", 1); + if (StringUtils.isNotBlank(apply.getString("client_pay_type")) && StringUtils.isNotBlank(apply.getString("client_pay_desc"))) { + clientConfig.put("client_pay_type", apply.getString("client_pay_type")); + clientConfig.put("client_pay_desc", apply.getString("client_pay_desc")); + } clientConfigMapper.save(clientConfig); apply.put("client_moniker", clientMoniker); diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientApplyImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientApplyImpl.java index 94a7e4227..99b8288a4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientApplyImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientApplyImpl.java @@ -26,6 +26,7 @@ import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageList; import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; @@ -217,6 +218,10 @@ public class ClientApplyImpl implements ClientApply, ApplicationEventPublisherAw clientMapper.save(partner); JSONObject clientConfig = new JSONObject(); + if (StringUtils.isNotBlank(apply.getString("client_pay_type")) && StringUtils.isNotBlank(apply.getString("client_pay_desc"))) { + clientConfig.put("client_pay_type", apply.getString("client_pay_type")); + clientConfig.put("client_pay_desc", apply.getString("client_pay_desc")); + } clientConfig.put("client_id",partner.getIntValue("client_id")); clientConfig.put("client_moniker",info.getClientMoniker()); clientConfigService.save(clientConfig); diff --git a/src/main/ui/merchant_application.html b/src/main/ui/merchant_application.html index e932ae63a..6842c7812 100644 --- a/src/main/ui/merchant_application.html +++ b/src/main/ui/merchant_application.html @@ -400,14 +400,126 @@ - +