diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
index 1c928cc8a..59f3ab265 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -3251,120 +3251,120 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 5594ab56c..a33882ce7 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -2406,6 +2406,7 @@
+
diff --git a/src/com/amarsoft/app/awe/config/CollectProperties.java b/src/com/amarsoft/app/awe/config/CollectProperties.java
index 82507b727..a934906a1 100644
--- a/src/com/amarsoft/app/awe/config/CollectProperties.java
+++ b/src/com/amarsoft/app/awe/config/CollectProperties.java
@@ -1,142 +1,163 @@
-package com.amarsoft.app.awe.config;
-
-
-public class CollectProperties{
-
- private String c_serverUrl;
- private String b_serverUrl;
- private String merchantId;
- private String flag;
- private String userName;
- private String userPass;
- private String businessCode;
- private String c_dataType;
- private String c_level;
- private String c_trxCode;
- private String c_version;
- private String b_trxCode;
- private String b_version;
- private String b_dataType;
- private String b_level;
- private String publicKeyUrl;
- private String privateKeyUrl;
- private String clearRequestUrl;
- private String batch_trxCode;//״
-
- public String getBatch_trxCode() {
- return batch_trxCode;
- }
- public void setBatch_trxCode(String batch_trxCode) {
- this.batch_trxCode = batch_trxCode;
- }
- public String getPublicKeyUrl() {
- return publicKeyUrl;
- }
- public void setPublicKeyUrl(String publicKeyUrl) {
- this.publicKeyUrl = publicKeyUrl;
- }
- public String getPrivateKeyUrl() {
- return privateKeyUrl;
- }
- public void setPrivateKeyUrl(String privateKeyUrl) {
- this.privateKeyUrl = privateKeyUrl;
- }
- public String getClearRequestUrl() {
- return clearRequestUrl;
- }
- public void setClearRequestUrl(String clearRequestUrl) {
- this.clearRequestUrl = clearRequestUrl;
- }
- public String getC_serverUrl() {
- return c_serverUrl;
- }
- public void setC_serverUrl(String c_serverUrl) {
- this.c_serverUrl = c_serverUrl;
- }
- public String getB_serverUrl() {
- return b_serverUrl;
- }
- public void setB_serverUrl(String b_serverUrl) {
- this.b_serverUrl = b_serverUrl;
- }
- public String getMerchantId() {
- return merchantId;
- }
- public void setMerchantId(String merchantId) {
- this.merchantId = merchantId;
- }
- public String getFlag() {
- return flag;
- }
- public void setFlag(String flag) {
- this.flag = flag;
- }
- public String getUserName() {
- return userName;
- }
- public void setUserName(String userName) {
- this.userName = userName;
- }
- public String getUserPass() {
- return userPass;
- }
- public void setUserPass(String userPass) {
- this.userPass = userPass;
- }
- public String getBusinessCode() {
- return businessCode;
- }
- public void setBusinessCode(String businessCode) {
- this.businessCode = businessCode;
- }
- public String getC_dataType() {
- return c_dataType;
- }
- public void setC_dataType(String c_dataType) {
- this.c_dataType = c_dataType;
- }
- public String getC_level() {
- return c_level;
- }
- public void setC_level(String c_level) {
- this.c_level = c_level;
- }
- public String getC_trxCode() {
- return c_trxCode;
- }
- public void setC_trxCode(String c_trxCode) {
- this.c_trxCode = c_trxCode;
- }
- public String getC_version() {
- return c_version;
- }
- public void setC_version(String c_version) {
- this.c_version = c_version;
- }
- public String getB_trxCode() {
- return b_trxCode;
- }
- public void setB_trxCode(String b_trxCode) {
- this.b_trxCode = b_trxCode;
- }
- public String getB_version() {
- return b_version;
- }
- public void setB_version(String b_version) {
- this.b_version = b_version;
- }
- public String getB_dataType() {
- return b_dataType;
- }
- public void setB_dataType(String b_dataType) {
- this.b_dataType = b_dataType;
- }
- public String getB_level() {
- return b_level;
- }
- public void setB_level(String b_level) {
- this.b_level = b_level;
- }
-
-
-}
+package com.amarsoft.app.awe.config;
+
+
+public class CollectProperties{
+
+ private String c_serverUrl;
+ private String b_serverUrl;
+ private String merchantId;
+ private String flag;
+ private String userName;
+ private String userPass;
+ private String businessCode;
+ private String c_dataType;
+ private String c_level;
+ private String c_trxCode;
+ private String c_version;
+ private String b_trxCode;
+ private String b_version;
+ private String b_dataType;
+ private String b_level;
+ private String publicKeyUrl;
+ private String privateKeyUrl;
+ private String clearRequestUrl;
+ private String batch_trxCode;//״
+ private String tianJinmerchantId;
+ private String tianJinuserName;
+ private String tianJinuserPass;
+
+ public String getBatch_trxCode() {
+ return batch_trxCode;
+ }
+ public void setBatch_trxCode(String batch_trxCode) {
+ this.batch_trxCode = batch_trxCode;
+ }
+ public String getPublicKeyUrl() {
+ return publicKeyUrl;
+ }
+ public void setPublicKeyUrl(String publicKeyUrl) {
+ this.publicKeyUrl = publicKeyUrl;
+ }
+ public String getPrivateKeyUrl() {
+ return privateKeyUrl;
+ }
+ public void setPrivateKeyUrl(String privateKeyUrl) {
+ this.privateKeyUrl = privateKeyUrl;
+ }
+ public String getClearRequestUrl() {
+ return clearRequestUrl;
+ }
+ public void setClearRequestUrl(String clearRequestUrl) {
+ this.clearRequestUrl = clearRequestUrl;
+ }
+ public String getC_serverUrl() {
+ return c_serverUrl;
+ }
+ public void setC_serverUrl(String c_serverUrl) {
+ this.c_serverUrl = c_serverUrl;
+ }
+ public String getB_serverUrl() {
+ return b_serverUrl;
+ }
+ public void setB_serverUrl(String b_serverUrl) {
+ this.b_serverUrl = b_serverUrl;
+ }
+ public String getMerchantId() {
+ return merchantId;
+ }
+ public void setMerchantId(String merchantId) {
+ this.merchantId = merchantId;
+ }
+ public String getFlag() {
+ return flag;
+ }
+ public void setFlag(String flag) {
+ this.flag = flag;
+ }
+ public String getUserName() {
+ return userName;
+ }
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+ public String getUserPass() {
+ return userPass;
+ }
+ public void setUserPass(String userPass) {
+ this.userPass = userPass;
+ }
+ public String getBusinessCode() {
+ return businessCode;
+ }
+ public void setBusinessCode(String businessCode) {
+ this.businessCode = businessCode;
+ }
+ public String getC_dataType() {
+ return c_dataType;
+ }
+ public void setC_dataType(String c_dataType) {
+ this.c_dataType = c_dataType;
+ }
+ public String getC_level() {
+ return c_level;
+ }
+ public void setC_level(String c_level) {
+ this.c_level = c_level;
+ }
+ public String getC_trxCode() {
+ return c_trxCode;
+ }
+ public void setC_trxCode(String c_trxCode) {
+ this.c_trxCode = c_trxCode;
+ }
+ public String getC_version() {
+ return c_version;
+ }
+ public void setC_version(String c_version) {
+ this.c_version = c_version;
+ }
+ public String getB_trxCode() {
+ return b_trxCode;
+ }
+ public void setB_trxCode(String b_trxCode) {
+ this.b_trxCode = b_trxCode;
+ }
+ public String getB_version() {
+ return b_version;
+ }
+ public void setB_version(String b_version) {
+ this.b_version = b_version;
+ }
+ public String getB_dataType() {
+ return b_dataType;
+ }
+ public void setB_dataType(String b_dataType) {
+ this.b_dataType = b_dataType;
+ }
+ public String getB_level() {
+ return b_level;
+ }
+ public void setB_level(String b_level) {
+ this.b_level = b_level;
+ }
+ public String getTianJinmerchantId() {
+ return tianJinmerchantId;
+ }
+ public void setTianJinmerchantId(String tianJinmerchantId) {
+ this.tianJinmerchantId = tianJinmerchantId;
+ }
+ public String getTianJinuserName() {
+ return tianJinuserName;
+ }
+ public void setTianJinuserName(String tianJinuserName) {
+ this.tianJinuserName = tianJinuserName;
+ }
+ public String getTianJinuserPass() {
+ return tianJinuserPass;
+ }
+ public void setTianJinuserPass(String tianJinuserPass) {
+ this.tianJinuserPass = tianJinuserPass;
+ }
+
+
+}
diff --git a/src/com/amarsoft/app/awe/config/InitCollectConfig.java b/src/com/amarsoft/app/awe/config/InitCollectConfig.java
index 95ccc5b38..439bb6651 100644
--- a/src/com/amarsoft/app/awe/config/InitCollectConfig.java
+++ b/src/com/amarsoft/app/awe/config/InitCollectConfig.java
@@ -1,62 +1,76 @@
-package com.amarsoft.app.awe.config;
-
-import javax.servlet.http.HttpServlet;
-
-import org.springframework.web.context.ContextLoader;
-import org.springframework.web.context.WebApplicationContext;
-
-import com.mchange.v2.c3p0.ComboPooledDataSource;
-
-/**
- * ȫ ӿϢ
- * @author yangdm
- */
-public class InitCollectConfig extends HttpServlet{
- private static final long serialVersionUID = 1L;
- public static final String C_SERVERURL;
- public static final String B_SERVERURL;
- public static final String MERCHANTID;
- public static final String FLAG;
- public static final String USERNAME;
- public static final String USERPASS;
- public static final String BUSSINESSCODE;
- public static final String C_DATATYPE;
- public static final String C_LEVEL;
- public static final String C_TRXCODE;
- public static final String C_VERSION;
- /**
- * ״룬ͬʵʱ
- */
- public static final String BATCH_TRXCODE;
- public static final String B_TRXCODE;
- public static final String B_VERSION;
- public static final String B_DATATYPE;
- public static final String B_LEVEL;
- public static final String PUBLICKEYURL;
- public static final String PRIVATEKEYURL;
- public static final String CLEARREQUESTURL;
-
- static{
- WebApplicationContext wac = ContextLoader.getCurrentWebApplicationContext();
- CollectProperties collectproperties = wac.getBean("collectConfig", CollectProperties.class);
- C_SERVERURL = collectproperties.getC_serverUrl();
- B_SERVERURL = collectproperties.getB_serverUrl();
- MERCHANTID = collectproperties.getMerchantId();
- FLAG = collectproperties.getFlag();
- USERNAME = collectproperties.getUserName();
- USERPASS = collectproperties.getUserPass();
- BUSSINESSCODE = collectproperties.getBusinessCode();
- C_DATATYPE = collectproperties.getC_dataType();
- C_LEVEL = collectproperties.getC_level();
- C_TRXCODE = collectproperties.getC_trxCode();
- C_VERSION = collectproperties.getC_version();
- BATCH_TRXCODE = collectproperties.getBatch_trxCode();
- B_TRXCODE = collectproperties.getB_trxCode();
- B_VERSION = collectproperties.getB_version();
- B_DATATYPE = collectproperties.getB_dataType();
- B_LEVEL = collectproperties.getB_level();
- PUBLICKEYURL=collectproperties.getPublicKeyUrl();
- PRIVATEKEYURL=collectproperties.getPrivateKeyUrl();
- CLEARREQUESTURL=collectproperties.getClearRequestUrl();
- }
-}
+package com.amarsoft.app.awe.config;
+
+import javax.servlet.http.HttpServlet;
+
+import org.springframework.web.context.ContextLoader;
+import org.springframework.web.context.WebApplicationContext;
+
+import com.mchange.v2.c3p0.ComboPooledDataSource;
+
+/**
+ * ȫ ӿϢ
+ * @author yangdm
+ */
+public class InitCollectConfig extends HttpServlet{
+ private static final long serialVersionUID = 1L;
+ public static final String C_SERVERURL;
+ public static final String B_SERVERURL;
+ public static final String MERCHANTID;
+ public static final String FLAG;
+ public static final String USERNAME;
+ public static final String USERPASS;
+ public static final String BUSSINESSCODE;
+ public static final String C_DATATYPE;
+ public static final String C_LEVEL;
+ public static final String C_TRXCODE;
+ public static final String C_VERSION;
+ /**
+ * ״룬ͬʵʱ
+ */
+ public static final String BATCH_TRXCODE;
+ public static final String B_TRXCODE;
+ public static final String B_VERSION;
+ public static final String B_DATATYPE;
+ public static final String B_LEVEL;
+ public static final String PUBLICKEYURL;
+ public static final String PRIVATEKEYURL;
+ public static final String CLEARREQUESTURL;
+ /**
+ * ̻
+ * ̻̻ţ001053110000013
+ ̻̻ƣӿڲ̻
+ ̻ûoperator13
+ ̻룺ora_123456
+ */
+ public static final String TIANJIN_MERCHANTID;
+ public static final String TIANJIN_USERNAME;
+ public static final String TIANJIN_USERPASS;
+
+
+ static{
+ WebApplicationContext wac = ContextLoader.getCurrentWebApplicationContext();
+ CollectProperties collectproperties = wac.getBean("collectConfig", CollectProperties.class);
+ C_SERVERURL = collectproperties.getC_serverUrl();
+ B_SERVERURL = collectproperties.getB_serverUrl();
+ MERCHANTID = collectproperties.getMerchantId();
+ FLAG = collectproperties.getFlag();
+ USERNAME = collectproperties.getUserName();
+ USERPASS = collectproperties.getUserPass();
+ BUSSINESSCODE = collectproperties.getBusinessCode();
+ C_DATATYPE = collectproperties.getC_dataType();
+ C_LEVEL = collectproperties.getC_level();
+ C_TRXCODE = collectproperties.getC_trxCode();
+ C_VERSION = collectproperties.getC_version();
+ BATCH_TRXCODE = collectproperties.getBatch_trxCode();
+ B_TRXCODE = collectproperties.getB_trxCode();
+ B_VERSION = collectproperties.getB_version();
+ B_DATATYPE = collectproperties.getB_dataType();
+ B_LEVEL = collectproperties.getB_level();
+ PUBLICKEYURL=collectproperties.getPublicKeyUrl();
+ PRIVATEKEYURL=collectproperties.getPrivateKeyUrl();
+ CLEARREQUESTURL=collectproperties.getClearRequestUrl();
+ TIANJIN_MERCHANTID=collectproperties.getTianJinmerchantId();
+ TIANJIN_USERNAME=collectproperties.getTianJinuserName();
+ TIANJIN_USERPASS=collectproperties.getTianJinuserPass();
+ }
+}
diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
index fa5963338..a4e40e121 100644
--- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
+++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
@@ -1,1772 +1,1835 @@
-package com.tenwa.collectaudit.cache;
-
-import java.io.File;
-import java.math.BigDecimal;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.springframework.jdbc.object.SqlCall;
-
-import jbo.app.tenwa.calc.LC_RENT_PLAN;
-import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT;
-import jbo.app.tenwa.customer.DISTRIBUTOR_INFO;
-import jbo.com.tenwa.entity.comm.flow.D_DEPOSITCHARGE_INFO;
-import jbo.com.tenwa.entity.comm.flow.D_DEPOSITRETURN_INFO;
-import jbo.com.tenwa.lease.comm.LB_BUCKLE_LOG;
-import jbo.com.tenwa.lease.comm.LB_CLEAR_FILE_RECORD;
-import jbo.com.tenwa.lease.comm.LB_INTFACE_FILE_RECORD;
-import jbo.com.tenwa.lease.comm.VI_LC_AUDIT_RENT_PLAN;
-import jbo.sys.CODE_LIBRARY;
-
-import com.amarsoft.app.als.sys.tools.DateTool;
-import com.amarsoft.app.awe.config.InitCollectConfig;
-import com.amarsoft.app.util.StringUtil;
-import com.amarsoft.are.jbo.BizObject;
-import com.amarsoft.are.jbo.BizObjectManager;
-import com.amarsoft.are.jbo.JBOException;
-import com.amarsoft.are.jbo.JBOFactory;
-import com.amarsoft.are.jbo.JBOTransaction;
-import com.amarsoft.are.util.StringFunction;
-import com.amarsoft.awe.util.ASResultSet;
-import com.amarsoft.awe.util.SqlObject;
-import com.amarsoft.awe.util.Transaction;
-import com.gnete.security.crypt.Crypt;
-import com.gnete.security.crypt.CryptException;
-import com.ibm.sslight.tools.mainExit;
-import com.tenwa.comm.util.date.DateAssistant;
-import com.tenwa.comm.util.jboutil.DataOperatorUtil;
-
-public class CollectAuditInfoCache {
-
- private String id;
- private String fileSavePath = "d:/tmp/als/InterFace";
- private String inputuserid;
- private String inputorgid;
- private String clearDate;
- private String distributor_id;
- private String penaltys;
-
- /**
- * ̱֤
- * ƻIDڱ֤ȡΪdepositcharge_id˻رΪRENT_PLAN_ID
- * @param depositcharge_id,tx
- * @return
- * @throws Exception
- */
- public void writeBackDistributor(String RENT_PLAN_ID,Transaction Sqlca) throws JBOException{
- BizObjectManager bmDCI = JBOFactory.getFactory().getManager(D_DEPOSITCHARGE_INFO.CLASS_NAME);
- BizObjectManager bmDRI = JBOFactory.getFactory().getManager(D_DEPOSITRETURN_INFO.CLASS_NAME);
- BizObjectManager bmDI = JBOFactory.getFactory().getManager(DISTRIBUTOR_INFO.CLASS_NAME);
- BizObject bDRI= bmDRI.createQuery("RENT_PLAN_ID=:RENT_PLAN_ID").setParameter("RENT_PLAN_ID", RENT_PLAN_ID).getSingleResult(false);
- String distributorId = bDRI.getAttribute("DISTRIBUTOR_ID").toString();
- String cautionMoney = bDRI.getAttribute("CAUTION_MONEY").toString();
- //D_DEPOSITCHARGE_INFO
- BizObject bDCI_N = bmDCI.newObject();
- bDCI_N.setAttributeValue("DISTRIBUTOR_ID", distributorId);
- bDCI_N.setAttributeValue("CAUTION_MONEY", cautionMoney);
- bDCI_N.setAttributeValue("MONEY_TYPE","bondBack");
- bDCI_N.setAttributeValue("INPUTTIME",StringFunction.getTodayNow());
- bDCI_N.setAttributeValue("INPUTUSERID",inputuserid);
- bDCI_N.setAttributeValue("INPUTORGID",inputorgid);
- bDCI_N.setAttributeValue("RENT_PLAN_ID",RENT_PLAN_ID);
- bmDCI.saveObject(bDCI_N);
- //ľϢĽ
- BizObject bDI = bmDI.createQuery("distributor_no=:distributor_id").setParameter("distributor_id", distributorId).getSingleResult(false);
- BigDecimal sum = new BigDecimal(bDI.getAttribute("sums").getString());
- double account_balance = sum.add(new BigDecimal(cautionMoney)).doubleValue();
- bmDI.createQuery("update O set O.sums='"+account_balance+"' where O.distributor_no=:distributor_id").setParameter("distributor_id", distributorId).executeUpdate();
- System.out.println("ɹ");
- }
-
- //ȡļ
- public static String getCollectIntface(String id) throws Exception{
-
- String sql="select lr.filename from LB_INTFACE_FILE_RECORD lr "
- + "where lr.id=:id";
- Map map=new HashMap();
- map.put("id", id);
- JBOTransaction tx = null;
- String filename="";
- tx=JBOFactory.createJBOTransaction();
- List