diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml index 59869bf25..e65b6391d 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml @@ -3284,5 +3284,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index f0731226c..8d9300498 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -134,6 +134,8 @@ + + @@ -278,6 +280,9 @@ + + + @@ -786,6 +791,8 @@ + + @@ -1052,6 +1059,8 @@ + + @@ -2397,6 +2406,7 @@ + @@ -2733,6 +2743,8 @@ + + @@ -3772,6 +3784,8 @@ + + @@ -4684,6 +4698,9 @@ + + + @@ -5109,6 +5126,11 @@ + + + + + @@ -5122,7 +5144,6 @@ - @@ -5155,6 +5176,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/collect_config.properties b/config/collect_config.properties index c08ea2cc7..9047de00a 100644 --- a/config/collect_config.properties +++ b/config/collect_config.properties @@ -12,6 +12,7 @@ com.tenwa.yangdm.bank.clearRequestUrl=http://59.41.103.98:9110/gzdsf/GetSettFile #com.tenwa.yangdm.merchantId=000191400207649 #test shang hu dai ma com.tenwa.yangdm.merchantId=001053110000001 +com.tenwa.yangdm.tianJinmerchantId=001053110000013 #--------------------------------------------------------------------------------------------- #daishoupeizhi ( 'S' dai biao dai shou,batch.trxCode dai biao piliangdaishou,collect.trxCode dai biao shishidaishou,version banbenhao) @@ -32,6 +33,8 @@ com.tenwa.yangdm.collect.level=5 #test (ce shi huan jing zheng shi tou chan hou zhu shi diao) com.tenwa.yangdm.collect.userName=operator com.tenwa.yangdm.collect.userPass=ora_123456 +com.tenwa.yangdm.collect.tianJinuserName=operator13 +com.tenwa.yangdm.collect.tianJinuserPass=ora_123456 com.tenwa.yangdm.collect.businessCode=10600 #yin hang ka si yao su yan zheng @@ -41,6 +44,6 @@ com.tenwa.yangdm.bank.dataType=2 com.tenwa.yangdm.bank.level=5 #an quan zheng shu xiang guan (si yao he gong yao de cun fang wei zhi) -com.tenwa.yangdm.publicKeyUrl=D:\\BaiduNetdisk\\Download\\SecutyKey\\gzdsf.cer -com.tenwa.yangdm.privateKeyUrl=D:\\BaiduNetdisk\\Download\\SecutyKey\\ORA@TEST1.p12 +com.tenwa.yangdm.publicKeyUrl=/soft/files/yinlian/SecutyKey/gzdsf.cer +com.tenwa.yangdm.privateKeyUrl=/soft/files/yinlian/SecutyKey/ORA@TEST1.p12 #com.tenwa.yangdm.privateKeyUrl=D:\\BaiduNetdisk\\Download\\SecutyKey\\cps@00019140020764901.p12 \ No newline at end of file diff --git a/src/com/amarsoft/app/awe/config/CollectProperties.java b/src/com/amarsoft/app/awe/config/CollectProperties.java index 770610121..a934906a1 100644 --- a/src/com/amarsoft/app/awe/config/CollectProperties.java +++ b/src/com/amarsoft/app/awe/config/CollectProperties.java @@ -22,7 +22,9 @@ public class CollectProperties{ 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; @@ -138,7 +140,24 @@ public class CollectProperties{ 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 b1896e851..439bb6651 100644 --- a/src/com/amarsoft/app/awe/config/InitCollectConfig.java +++ b/src/com/amarsoft/app/awe/config/InitCollectConfig.java @@ -35,7 +35,16 @@ public class InitCollectConfig extends HttpServlet{ 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{ @@ -60,5 +69,8 @@ public class InitCollectConfig extends HttpServlet{ 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_jbo/jbo/app/tenwa/customer/DEDUCTIONS_WAY.java b/src_jbo/jbo/app/tenwa/customer/DEDUCTIONS_WAY.java new file mode 100644 index 000000000..506cf8bd8 --- /dev/null +++ b/src_jbo/jbo/app/tenwa/customer/DEDUCTIONS_WAY.java @@ -0,0 +1,60 @@ +package jbo.app.tenwa.customer; + +import java.lang.String; + +/** +* ؿʽ - JBO

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface DEDUCTIONS_WAY{ + /** + * ؿʽ

+ * ӳBizObjectClass + */ + public static final String CLASS_NAME = "jbo.app.tenwa.customer.DEDUCTIONS_WAY"; + /** + * ʶ STRING(32)
+ */ + public static final String id = "id"; + /** + * STRING(200)
+ */ + public static final String dealers_number = "dealers_number"; + /** + * STRING(32)
+ */ + public static final String distributor_id = "distributor_id"; + /** + * STRING(200)
+ */ + public static final String dealers_name = "dealers_name"; + /** + * Ƿ STRING(32)
+ */ + public static final String Whether_to_enable = "Whether_to_enable"; + /** + * Ǽ STRING(32)
+ */ + public static final String inputuserid = "inputuserid"; + /** + * ǼDz STRING(32)
+ */ + public static final String inputorgid = "inputorgid"; + /** + * Ǽʱ STRING(32)
+ */ + public static final String inputtime = "inputtime"; + /** + * STRING(32)
+ */ + public static final String updateuserid = "updateuserid"; + /** + * ² STRING(32)
+ */ + public static final String updateorgid = "updateorgid"; + /** + * ʱ STRING(32)
+ */ + public static final String updatetime = "updatetime"; +} \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/customer/LPOUNDAGE_MAINTENANCE.java b/src_jbo/jbo/app/tenwa/customer/LPOUNDAGE_MAINTENANCE.java new file mode 100644 index 000000000..a7b66a3af --- /dev/null +++ b/src_jbo/jbo/app/tenwa/customer/LPOUNDAGE_MAINTENANCE.java @@ -0,0 +1,72 @@ +package jbo.app.tenwa.customer; + +import java.lang.String; + +/** +* ۿά - JBO

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface LPOUNDAGE_MAINTENANCE{ + /** + * ۿά

+ * ӳBizObjectClass + */ + public static final String CLASS_NAME = "jbo.app.tenwa.customer.LPOUNDAGE_MAINTENANCE"; + /** + * ʶ STRING(32)
+ */ + public static final String id = "id"; + /** + * ʼ STRING(32)
+ */ + public static final String start_date = "start_date"; + /** + * ֹ STRING(32)
+ */ + public static final String expiry_date = "expiry_date"; + /** + * Ч STRING(50)
+ */ + public static final String validity_date = "validity_date"; + /** + * STRING(50)
+ */ + public static final String subject = "subject"; + /** + * ۿ STRING(50)
+ */ + public static final String charge_channel = "charge_channel"; + /** + * ۿʽ STRING(50)
+ */ + public static final String charge_way = "charge_way"; + /** + * STRING(50)
+ */ + public static final String rate = "rate"; + /** + * Ǽ STRING(32)
+ */ + public static final String inputuserid = "inputuserid"; + /** + * ǼDz STRING(32)
+ */ + public static final String inputorgid = "inputorgid"; + /** + * Ǽʱ STRING(32)
+ */ + public static final String inputtime = "inputtime"; + /** + * STRING(32)
+ */ + public static final String updateuserid = "updateuserid"; + /** + * ² STRING(32)
+ */ + public static final String updateorgid = "updateorgid"; + /** + * ʱ STRING(32)
+ */ + public static final String updatetime = "updatetime"; +} \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/customer/SEND_TEXT_MMESSAGE.java b/src_jbo/jbo/app/tenwa/customer/SEND_TEXT_MMESSAGE.java new file mode 100644 index 000000000..ef146f2b6 --- /dev/null +++ b/src_jbo/jbo/app/tenwa/customer/SEND_TEXT_MMESSAGE.java @@ -0,0 +1,60 @@ +package jbo.app.tenwa.customer; + +import java.lang.String; + +/** +* ŷ - JBO

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface SEND_TEXT_MMESSAGE{ + /** + * ŷ

+ * ӳBizObjectClass + */ + public static final String CLASS_NAME = "jbo.app.tenwa.customer.SEND_TEXT_MMESSAGE"; + /** + * ʶ STRING(32)
+ */ + public static final String id = "id"; + /** + * STRING(50)
+ */ + public static final String channel_name = "channel_name"; + /** + * STRING(32)
+ */ + public static final String channel_no = "channel_no"; + /** + * STRING(32)
+ */ + public static final String channel_code = "channel_code"; + /** + * STRING(40)
+ */ + public static final String msg_type = "msg_type"; + /** + * Ǽ STRING(32)
+ */ + public static final String inputuserid = "inputuserid"; + /** + * ǼDz STRING(32)
+ */ + public static final String inputorgid = "inputorgid"; + /** + * Ǽʱ STRING(32)
+ */ + public static final String inputtime = "inputtime"; + /** + * STRING(32)
+ */ + public static final String updateuserid = "updateuserid"; + /** + * ² STRING(32)
+ */ + public static final String updateorgid = "updateorgid"; + /** + * ʱ STRING(32)
+ */ + public static final String updatetime = "updatetime"; +} \ No newline at end of file diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java index fd74b31b0..a4e40e121 100644 --- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java +++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java @@ -10,6 +10,20 @@ 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; @@ -23,20 +37,10 @@ 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; -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; - public class CollectAuditInfoCache { private String id; @@ -647,7 +651,6 @@ public class CollectAuditInfoCache { int i = 0,j = 0; String[] ids = id.split("@"); String[] penaltyArray = penaltys.split("@"); - String COMPENSATORY_CON=null; BizObjectManager bm = JBOFactory.getFactory().getManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME,tx); BizObjectManager bc = JBOFactory.getFactory().getManager(LC_RENT_PLAN.CLASS_NAME,tx); @@ -660,23 +663,9 @@ public class CollectAuditInfoCache { BigDecimal interest =new BigDecimal(bom.getAttribute("interest").getString()); BigDecimal penalty = new BigDecimal(penaltyArray[c]); String t_rent = corpus.add(interest).add(penalty).toString(); - - /** - * ȡһǷд¼ - */ - String contract_id = bom.getAttribute("contract_id").toString(); - int plan_list=Integer.parseInt(bom.getAttribute("plan_list").toString())-1; - // ѯǰҪڴεһڴ¼ ϵ¼1ûĬΪ1 - BizObject ddi = bd.createQuery("SELECT O.COMPENSATORY_CON FROM O WHERE O.MONEY_TYPE='bondRepay' AND O.CONTRACT_ID='"+contract_id+"' AND O.PLAN_LIST='"+plan_list+"'").getSingleResult(false); - if(ddi!=null && !"".equals(ddi)) { - COMPENSATORY_CON=String.valueOf(Integer.parseInt(ddi.getAttribute("COMPENSATORY_CON").getString())+1); - }else { - COMPENSATORY_CON="1"; - } - //handcraftsingleCollectMoenyһԭΪhire_listָΪͻϢǻԣ //ʵձ - // Map map = handcraftsingleCollectMoenyDistrbutor(tx,bc,bom,rent,penaltyArray[c]); + // Map map = handcraftsingleCollectMoenyDistrbutor(tx,bc,bom,rent,penaltyArray[c]); i++; //ո״̬ bc.createQuery("update O set O.COLLECT_STATUS=:COLLECT_STATUS ,O.COLLECT_MSG=:COLLECT_MSG,O.PENALTY=:PENALTY where O.id=:id") @@ -699,7 +688,6 @@ public class CollectAuditInfoCache { bod.setAttributeValue("CONTRACT_ID",bom.getAttribute("contract_id").toString()); bod.setAttributeValue("PLAN_LIST",bom.getAttribute("plan_list").toString()); bod.setAttributeValue("RENT_PLAN_ID",bom.getAttribute("id").toString()); - bod.setAttributeValue("COMPENSATORY_CON",COMPENSATORY_CON); bd.saveObject(bod); //޸ľϢĽ bdi.createQuery("update O set O.sums='"+account_balance+"' where O.distributor_no=:distributor_id").setParameter("distributor_id", distributor_id).executeUpdate(); @@ -795,10 +783,14 @@ public class CollectAuditInfoCache { BizObjectManager bm = JBOFactory.getFactory().getManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME); BizObjectManager bc = JBOFactory.getFactory().getManager(LC_RENT_PLAN.CLASS_NAME); //ڵݽв - List bolist = bm.createQuery("select distinct O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,O.rent from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.id in ("+parms.toString()+")").getResultList(false); + List bolist = bm.createQuery("select distinct O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,O.rent,O.SUBJECTID from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.id in ("+parms.toString()+") and O.SUBJECTID='aa740e4111c111eaaa0000163e0e11e6'").getResultList(false); + List tianjinbolist = bm.createQuery("select distinct O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,O.rent,O.SUBJECTID from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.id in ("+parms.toString()+") and O.SUBJECTID='d989246c11c111eaaa0000163e0e11e6'").getResultList(false); if (bolist.size() != 0) { singleBatchCollectMoeny(tx, bolist); } + if (tianjinbolist.size() != 0) { + singleBatchCollectMoeny(tx, tianjinbolist); + } return "ϵͳڴУԺ"; } @@ -820,7 +812,7 @@ public class CollectAuditInfoCache { parms.append(",'"+str+"'"); } } - List bolist = bm.createQuery("select distinct O.BATCH_NO,O.BATCH_SN,O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,O.rent from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.id in ("+parms.toString()+")").getResultList(false); + List bolist = bm.createQuery("select distinct O.BATCH_NO,O.BATCH_SN,O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,O.rent,O.SUBJECTID from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.id in ("+parms.toString()+")").getResultList(false); for (BizObject bo : bolist) { String query_sn = bo.getAttribute("BATCH_NO").toString(); String sn = bo.getAttribute("BATCH_SN").toString(); @@ -879,9 +871,9 @@ public class CollectAuditInfoCache { .setParameter("COLLECT_MSG", ",տɹ") .setParameter("BATCH_STATUS", "complete")//״̬- .setParameter("id", bo.getAttribute("id").toString()).executeUpdate(); - BizObject boDDI=JBOFactory.createBizObjectQuery(D_DEPOSITRETURN_INFO.CLASS_NAME,"RENT_PLAN_ID=:rentPlanId").setParameter("rentPlanId", bo.getAttribute("id").toString()).getSingleResult(false); + BizObject boDDI=JBOFactory.createBizObjectQuery(D_DEPOSITRETURN_INFO.CLASS_NAME,"RENT_PLAN_ID=:rentPlanId").setParameter("rentPlanId", id).getSingleResult(false); if(boDDI!=null){ - this.writeBackDistributor(bo.getAttribute("id").toString(),Sqlca); + this.writeBackDistributor(id,Sqlca); } bo.setAttributeValue("COLLECT_STATUS", "տ"); bo.setAttributeValue("COLLECT_MSG", ",տɹ"); @@ -919,9 +911,9 @@ public class CollectAuditInfoCache { .setParameter("COLLECT_MSG", ",տɹ") .setParameter("BATCH_STATUS", "complete")//״̬- .setParameter("id", bo.getAttribute("id").toString()).executeUpdate(); - BizObject boDDI=JBOFactory.createBizObjectQuery(D_DEPOSITRETURN_INFO.CLASS_NAME,"RENT_PLAN_ID=:rentPlanId").setParameter("rentPlanId", bo.getAttribute("id").toString()).getSingleResult(false); + BizObject boDDI=JBOFactory.createBizObjectQuery(D_DEPOSITRETURN_INFO.CLASS_NAME,"RENT_PLAN_ID=:rentPlanId").setParameter("rentPlanId", id).getSingleResult(false); if(boDDI!=null){ - this.writeBackDistributor( bo.getAttribute("id").toString(),Sqlca); + this.writeBackDistributor(id,Sqlca); } bo.setAttributeValue("COLLECT_STATUS", "տ"); bo.setAttributeValue("COLLECT_MSG", ",տɹ"); @@ -1007,6 +999,9 @@ public class CollectAuditInfoCache { String month = currentDateTime.substring(5,7); String day = currentDateTime.substring(8,10); String merchantNumber = InitCollectConfig.MERCHANTID; + if(bo!=null&&bo.getAttribute("SUBJECTID")!=null&&"".equals(bo.getAttribute("SUBJECTID").getString())){ + merchantNumber=InitCollectConfig.TIANJIN_MERCHANTID; + } String flag = InitCollectConfig.FLAG; String version = InitCollectConfig.C_VERSION; String date = currentYear+month+day;//ύ @@ -1023,7 +1018,7 @@ public class CollectAuditInfoCache { } String req_sn = System.currentTimeMillis()+"";//κ batch_title = merchantNumber+"_"+flag+version+date+"_"+req_sn; - StringBuffer strbuff = queryBatchXML(req_sn, query_sn,sn); + StringBuffer strbuff = queryBatchXML(merchantNumber,req_sn, query_sn, sn); // queryBatchXML(req_sn, query_sn, sn); //Ӧ String strResp = cp.CollectAuditPayReq(strbuff,file.getAbsolutePath(), batch_title); @@ -1033,7 +1028,52 @@ public class CollectAuditInfoCache { return map; } - + /** + * ̻Żȡѯ + * @param merchantNumber + * @param req_sn + * @param query_sn + * @param sn + * @return + */ + private StringBuffer queryBatchXML(String merchantNumber, String req_sn, String query_sn, String sn) { + StringBuffer strbuff = new StringBuffer(); + if(InitCollectConfig.MERCHANTID.equals(merchantNumber)){ + strbuff = queryBatchXML(req_sn, query_sn, sn); + }else{ + strbuff.append(""); + strbuff.append(""); + strbuff.append(""); + Info info = new Info(); + info.setTRX_CODE("200001"); + info.setVERSION(InitCollectConfig.C_VERSION); + info.setDATA_TYPE(InitCollectConfig.C_DATATYPE); + info.setREQ_SN(req_sn); + info.setUSER_NAME(InitCollectConfig.TIANJIN_USERNAME); + info.setUSER_PASS(InitCollectConfig.TIANJIN_USERPASS); + info.setSIGNED_MSG(""); + strbuff.append(EntityTransform.toXml(info)); + strbuff.append(""); + strbuff.append(""); + strbuff.append(""); + strbuff.append(""); + strbuff.append(query_sn);//ҪѯĽˮ + strbuff.append(""); + strbuff.append(""); + strbuff.append(""); + strbuff.append(""); + strbuff.append(""); + strbuff.append(""); + strbuff.append(""); + strbuff.append(sn);//ϸ + strbuff.append(""); + strbuff.append(""); + strbuff.append(""); + strbuff.append(""); + strbuff.append(""); + } + return strbuff; + } /** * ѯӿ-- @@ -1152,6 +1192,9 @@ public class CollectAuditInfoCache { String month = currentDateTime.substring(5,7); String day = currentDateTime.substring(8,10); String merchantNumber = InitCollectConfig.MERCHANTID; + if(list.get(0).getAttribute("SUBJECTID")!=null&&"d989246c11c111eaaa0000163e0e11e6".equals(list.get(0).getAttribute("SUBJECTID").getString())){ + merchantNumber = InitCollectConfig.TIANJIN_MERCHANTID; + } String flag = InitCollectConfig.FLAG; String version = InitCollectConfig.C_VERSION; String date = currentYear+month+day;//ύ @@ -1254,6 +1297,10 @@ public class CollectAuditInfoCache { info.setUSER_PASS(InitCollectConfig.USERPASS); info.setREQ_SN(req_sn); info.setSIGNED_MSG(""); + if(list.get(0).getAttribute("SUBJECTID")!=null&&"d989246c11c111eaaa0000163e0e11e6".equals(list.get(0).getAttribute("SUBJECTID").getString())){ + info.setUSER_NAME(InitCollectConfig.TIANJIN_USERNAME); + info.setUSER_PASS(InitCollectConfig.TIANJIN_USERPASS); + } strbuff.append(EntityTransform.toXml(info)); strbuff.append(""); strbuff.append("");