diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
index 13b6c5c5d..7da28b33f 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -1291,6 +1291,7 @@
+
@@ -1323,6 +1324,8 @@
+
+
@@ -1428,7 +1431,9 @@
-
+
+
+
@@ -1728,6 +1733,8 @@
+
+
diff --git a/src_cmb/com/tenwa/sdk/controller/PayController.java b/src_cmb/com/tenwa/sdk/controller/PayController.java
index f2ff2867b..4cab547b8 100644
--- a/src_cmb/com/tenwa/sdk/controller/PayController.java
+++ b/src_cmb/com/tenwa/sdk/controller/PayController.java
@@ -339,8 +339,8 @@ public class PayController extends BaseFlowStartAction {
for (String income_id : income_ids) {
String date = df.format(new Date());
pay_detail = new SDKDcPayReqxVO();
- infoOne = bankBo.createQuery("select o.PROJECT_ID,o.FEE_TYPE,o.PAY_TYPE,o.BANK_SQRNBR,o.BANK_PAY_ID,o.BANK_REQNBR,o.FACT_MONEY,o.memo,o.CONTRACT_ID,o.PAYMENT_NUMBER,o.PLAN_LIST,FLOWUNID,contract_info.CONTRACT_NO,distributor.acc_number,distributor.bank_name,distributor.account,distributor.CRTPVC,distributor.CRTCTY from o left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO contract_info on o.CONTRACT_ID = contract_info.id left join jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT distributor on contract_info.distributor_id = distributor.id and distributor.is_main='Y' where o.id=:id and o.PAY_TYPE = 'pay_type_out' ").setParameter("id", income_id).getSingleResult(false);
- if(infoOne==null) {
+ infoOne = bankBo.createQuery("select o.PROJECT_ID,o.FEE_TYPE,o.PAY_TYPE,o.BANK_SQRNBR,o.BANK_PAY_ID,o.BANK_REQNBR,o.FACT_MONEY,o.memo,o.CONTRACT_ID,o.PAYMENT_NUMBER,o.PLAN_LIST,FLOWUNID,contract_info.CONTRACT_NO,distributor.acc_number,distributor.open_bank,distributor.account,distributor.district,distributor.provinceInfo from o left join jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO contract_info on o.CONTRACT_ID = contract_info.id left join jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT distributor on contract_info.distributor_id = distributor.id and distributor.is_main='Y' where o.id=:id and o.PAY_TYPE = 'pay_type_out' ").setParameter("id", income_id).getSingleResult(false);
+ if(infoOne==null) {
map.put("code", "1") ;
map.put("msg", "["+index+"]ݲ,") ;
JSONObject jsonObj = JSONObject.fromObject(map);
@@ -356,10 +356,10 @@ public class PayController extends BaseFlowStartAction {
String PAY_TYPE = infoOne.getAttribute("PAY_TYPE").toString();
String CONTRACT_NO = infoOne.getAttribute("CONTRACT_NO").toString();
String CRTACC = infoOne.getAttribute("acc_number").toString();
- String BANK_NAME = infoOne.getAttribute("bank_name").toString();
+ String BANK_NAME = infoOne.getAttribute("open_bank").toString();
String CRTNAM = infoOne.getAttribute("account").toString();
- String CRTPVC = infoOne.getAttribute("CRTPVC").toString();
- String CRTCTY = infoOne.getAttribute("CRTCTY").toString();
+ String CRTPVC = infoOne.getAttribute("provinceInfo").toString();
+ String CRTCTY = infoOne.getAttribute("district").toString();
String NUSAGE = infoOne.getAttribute("memo").toString();
String BANK_YURREF = infoOne.getAttribute("BANK_YURREF").toString();
String BANK_SQRNBR = infoOne.getAttribute("BANK_SQRNBR").toString();
@@ -428,8 +428,18 @@ public class PayController extends BaseFlowStartAction {
|| check==-1
|| CRTPVC==null || "".equals( CRTPVC )
){
- error_msg_tips = error_msg_tips+ "["+index+"]ݲ,\n" ;
+ error_null_tips = error_null_tips+ "["+index+"]ݲ,\n" ;
}
+
+ if(CRTPVC!=null && !"".equals(CRTPVC)) {
+ if(CRTCTY.indexOf(CRTPVC)!=-1) {
+ CRTCTY = CRTCTY.substring(CRTPVC.length());
+ }
+ }
+
+
+
+
String TRSAMT = FACT_MONEY.toPlainString();
String YURREF = index + date+UUID.randomUUID().toString().replaceAll("-", "").substring(0, 10) ;