anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@git2.tenwa.com.cn:ApzlDev/apzl_leasing.git into develop

Browse Source
This commit is contained in:
liujiaji 2018-06-26 09:46:59 +08:00
commit 575fce6795
8 changed files with 70 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/WEB-INF/etc/jbo/jbo_customer.xml
View File

@ -133,6 +133,8 @@
<attribute name="updateorgid" label="更新部门" type="STRING" length="32"/>
<attribute name="inputtime" label="登记时间" type="STRING" length="32"/>
<attribute name="updatetime" label="更新时间" type="STRING" length="32"/>
<attribute name="distributor_id" label="经销商编号" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>

1
WebContent/WEB-INF/etc/jbo/jbo_lease.xml
View File

@ -919,6 +919,7 @@
<attribute name="Marital_status" label="婚姻状态" type="STRING" length="32"/>
<attribute name="company_phone" label="公司电话" type="INT" length="11"/>
<attribute name="Major_monthly_income" label="主要月收入" type="DOUBLE" length="22" scale="2"/>
<attribute name="IS_HIS" label="是否存过历史" type="STRING" length="10" />
</attributes>

2
config/license.properties
View File

@ -1 +1 @@
key=JTNGdiUzRnpVJTNEJTVDWCU1Q1olM0YlNUIlNUM5ZHgrJTI0JTVDJTIwMyUyM0IlM0RLNCUzRmMlM0ZvJTNGZyUzRmslM0ZoJTNGb2JTN19SS0gwY2Q3JTI5MSUyNUQ5RyU1RCUzRmMlM0ZvYjRLL1J0ZEUlM0Z6JTNGeCUyNi0lM0Z2JTVDakAvUmthM0piJTYwVkR4JTNGeCUzRnZNciU1Q2glNUJwR3FVaSU1QnFFdkBoJTNGeCUzRnYlNUR3Tm1PbU0vL2slM0ZnKnklM0ZkJTNBcyUzRnM2ZyUzRnYlMjYvJTVCaiU1QiUzQkdnQm0lM0Z4JTNGdk93Tm1JekpnJTNGeDViKnklM0ZkJTNGZiUzRmQyYSUzRnYyb1h4RWZPbU9zJTNGeCUzRnZKal9lTWJjNiUzRnhVQiUzQVVBNSU1QlhGLSU1RCUyMFQlNjAvQS9yJTNGZCUzRC4lM0ZnJTNEZjluMm9VaFRpYjBacCUyNnIlM0Z2TnAlNjAlNUNZYSU1RGdUdk1jT29EeiUzRnhNdiUzRmclM0ZnJTNGZyUzRmclM0ZnJTNGdi54TnBPZyU1RGclNUVmVnhQJTVCTmklNjAzJTNGeCUzRnZJelkvNnQlM0Z4JTNGdiUzRmpOdWNaJTVCcCU1Qi8lNUNxTnpJaCU1RWslM0Z4JTNGdmNaJTYwNCU1Q2dWeiU1Q3FBY0tnVWlZZVNxJTYwJTIwMWglM0Z2RnpIJTVCQS5HdiUzRng3diUzRG4lM0YvJTNGcyUzRnYlM0ZqJTVCb015ViU1QmI1JTNGeCUzRnYlM0ZqQCUzQmI2UXZHa0ZoQHZfeVolM0JUeUJiUCU1QiUzRnhkJTI1JTNGaiU2MC0lNUVlTGhWJTNCQ2ZhQ2I2JTNGeA==
key =P3Y/elU9XFhcWj9bXDlkeCskXCAzI0I9SzQ/Yz9vP2c/az9oP29iUzdfUktIMGNkNykxJUQ5R10/Yz9vYjRLL1J0ZEU/ej94Ji0/dlxqQC9Sa2EzSmJgVkR4P3g/dk1yXGhbcEdxVWlbcUV2QGg/eD92XXdObU9tTS8vaz9nKnk/ZDpzP3M2Zz92Ji9bals7R2dCbT94P3ZPd05tSXpKZz94NWIqeT9kP2Y/ZDJhP3Yyb1h4RWZPbU9zP3g/dkpqX2VNYmM2P3hVQjpVQTVbWEYtXSBUYC9BL3I/ZD0uP2c9ZjluMm9VaFRpYjBacCZyP3ZOcGBcWWFdZ1R2TWNPb0R6P3hNdj9nP2c/Zz9nP2c/di54TnBPZ11nXmZWeFBbTmlgMz94P3ZJelkvNnQ/eD92P2pOdWNaW3BbL1xxTnpJaF5rP3g/dmNaYDRcZ1Z6XHFBY0tnVWlZZVNxYCAxaD92RnpIW0EuR3Y/eDd2PW4/Lz9zP3Y/altvTXlWW2I1P3g/dj9qQDtiNlF2R2tGaEB2X3laO1R5QmJQWz94ZCU/amAtXmVMaFY7Q2ZhQ2I2P3g=

2
src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java
View File

@ -89,7 +89,7 @@ public class CmbToCallbackController extends BaseFlowStartAction {
SDKNtstLinFxVo ntstLinFxOne = null ;
for(BizObject check_list_one : check_list_bo) {
ntstLinFxOne = new SDKNtstLinFxVo();
String ONE_REQNBR = check_list_one.getAttribute("BANK_REQNBR").toString();
String ONE_REQNBR = check_list_one.getAttribute("REQNBR").toString();
ntstLinFxOne.setREQNBR(ONE_REQNBR);
ntstLinFxList.add(ntstLinFxOne);
}

8
src_cmb/com/tenwa/sdk/controller/CmbToPayController.java
View File

@ -88,7 +88,7 @@ public class CmbToPayController extends BaseFlowStartAction {
* 本方放款账户获取######开始
*/
BizObjectManager accountManager = JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME);
List<BizObject> accountBoList = accountManager.createQuery("select o.acc_number,o.acc_bank,o.acc_name,o.branch_code,oi.OWN_NAME from o join jbo.com.tenwa.entity.comm.own.OWN_INFO oi on o.own_id = oi.OWN_NUMBER where o.money_type='01' and o.state_='0010' and acc_type='0010' and account_type='out_account' ").getResultList(false);
List<BizObject> accountBoList = accountManager.createQuery("select o.id,o.acc_number,o.acc_bank,o.acc_name,o.branch_code,oi.OWN_NAME from o join jbo.com.tenwa.entity.comm.own.OWN_INFO oi on o.own_id = oi.OWN_NUMBER where o.money_type='01' and o.state_='0010' and acc_type='0010' and account_type='out_account' ").getResultList(false);
if( accountBoList==null ) {
map.put("code", "1") ;
map.put("msg", "本方账户不存在,请检查") ;
@ -352,6 +352,7 @@ public class CmbToPayController extends BaseFlowStartAction {
pay_detail_bo.setAttributeValue("CCYNBR", CCYNBR);
pay_detail_bo.setAttributeValue("STLCHN", STLCHN);
pay_detail_bo.setAttributeValue("NUSAGE", NUSAGE);
pay_detail_bo.setAttributeValue("BUSNAR", BUSNAR);
pay_detail_bo.setAttributeValue("CRTACC", CRTACC);
pay_detail_bo.setAttributeValue("CRTNAM", CRTNAM);
pay_detail_bo.setAttributeValue("BNKFLG", BNKFLG);
@ -392,7 +393,7 @@ public class CmbToPayController extends BaseFlowStartAction {
xmlStr = xmlStr.replace("<dcPayReqxList>", "").replace("</dcPayReqxList>", "").replace("<dcPayReqxList/>", "");
try {
System.out.println(xmlStr); //控制台打印请求的XML数据
HttpRequest request = new HttpRequest("http://192.168.7.85:65188");
HttpRequest request = new HttpRequest("http://172.16.20.242:65188");
request.setTimeout(3000);
//HttpRequest request = new HttpRequest();
String data = xmlStr;
@ -408,6 +409,8 @@ public class CmbToPayController extends BaseFlowStartAction {
if(result.getInfo().getSTATUS()==1) {
if("0".equals( result.getInfo().getRETCOD() )) {
pay_info_bo.setAttributeValue("FACT_MONEY",all_money.toPlainString());
pay_info_bo.setAttributeValue("CMB_PAY_NO",CMB_PAY_NO) ;
pay_info_bo.setAttributeValue("BANK_ID",accountBo.getAttribute("id").toString()) ;
tx.join(pay_info_bom);// 插入支付信息表
pay_info_bom.saveObject(pay_info_bo);
if(pay_detail_bom!=null) {
@ -458,6 +461,7 @@ public class CmbToPayController extends BaseFlowStartAction {
callback_detail_bo.setAttributeValue("ID", UUID.randomUUID().toString().replaceAll("-", ""));
callback_detail_bo.setAttributeValue("CMB_PAY_NO",CMB_PAY_NO);
callback_detail_bo.setAttributeValue("YURREF",DETAIL_YURREF);
callback_detail_bo.setAttributeValue("FLOWUNID",FLOWUNID);
callback_detail_bo.setAttributeValue("SQRNBR",detail.getSQRNBR());
callback_detail_bo.setAttributeValue("REQNBR",detail.getREQNBR());
callback_detail_bo.setAttributeValue("REQSTS",detail.getREQSTS());

15
src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerTempToFormalBusiness.java
View File

@ -18,6 +18,7 @@ import jbo.app.tenwa.customer.CUSTOMER_INFO_HIS;
import jbo.app.tenwa.customer.CUSTOMER_PERSON;
import jbo.app.tenwa.customer.CUSTOMER_PERSON_HIS;
import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP;
import jbo.app.tenwa.customer.DISTRIBUTOR_INFO;
import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT;
import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE;
@ -94,6 +95,13 @@ public class LBCustomerTempToFormalBusiness extends BaseBussiness {
cust.setAttributeValue("certtype",cert.getAttribute("certtype").getString());
cust.setAttributeValue("certid",cert.getAttribute("certid").getString());
}
String inputorgid = bo.getAttribute("inputorgid").toString();
if(inputorgid.startsWith("8006")) {
BizObject distributor_bo=JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",inputorgid).getSingleResult(false);
if(distributor_bo!=null) {
cust.setAttributeValue("distributor_id",distributor_bo.getAttribute("distributor_no"));
}
}
cust.setAttributeValue("inputuserid",bo.getAttribute("inputuserid"));
cust.setAttributeValue("inputorgid",bo.getAttribute("inputorgid"));
cust.setAttributeValue("inputtime",bo.getAttribute("inputtime"));
@ -155,6 +163,13 @@ public class LBCustomerTempToFormalBusiness extends BaseBussiness {
cust.setAttributeValue("certtype",cert.getAttribute("certtype").getString());
cust.setAttributeValue("certid",cert.getAttribute("certid").getString());
}
String inputorgid = bo.getAttribute("inputorgid").toString();
if(inputorgid.startsWith("8006")) {
BizObject distributor_bo=JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO.CLASS_NAME,"orgid=:orgid").setParameter("orgid",inputorgid).getSingleResult(false);
if(distributor_bo!=null) {
cust.setAttributeValue("distributor_id",distributor_bo.getAttribute("distributor_no"));
}
}
cust.setAttributeValue("inputuserid",bo.getAttribute("inputuserid"));
cust.setAttributeValue("inputorgid",bo.getAttribute("inputorgid"));
cust.setAttributeValue("inputtime",bo.getAttribute("inputtime"));

19
src_tenwa/com/tenwa/lease/flow/project/validate/IdentityVerification.java
View File

@ -1,13 +1,10 @@
package com.tenwa.lease.flow.project.validate;
import java.io.InputStream;
import java.net.URLDecoder;
import java.util.List;
import java.util.Properties;
import org.apache.commons.codec.binary.Base64;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import sun.misc.BASE64Decoder;
import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.BizObjectManager;
@ -30,17 +27,9 @@ public class IdentityVerification {
try {
BizObjectManager bom1 = JBOFactory.getBizObjectManager(CUSTOMER_PERSON_TEMP.CLASS_NAME,tx);
BizObject identityObject = bom1.createQuery("ID=:id").setParameter("id", id).getSingleResult(false);
//读取授权文件，因为其他方法都读取不到，只能通过此方法
Properties prop = new Properties();
InputStream in= IdentityVerification.class.getClassLoader().getResourceAsStream("license.properties");
prop.load(in);
String property = prop.getProperty("key");
Base64 base64 = new Base64();
String msg = new String(base64.decode(property.getBytes("utf-8")),"utf-8");
String decode = URLDecoder.decode(msg,"utf-8");
char[] charArray = decode.toCharArray();
charArray[16]='+';
decode = new String(charArray);
//读取授权文件
String license =ValidatePropertiesUtil.get("key");
String decode = new String(new BASE64Decoder().decodeBuffer(license));
String inConditions = SoapRequest.XMLConfiguration(identityObject.getAttribute("CERTID").getString(),identityObject.getAttribute("FULLNAME").getString());
String result = NciicClient.executeClient("NciicServices",decode,inConditions);
Document document = DocumentHelper.parseText(result);

40
src_tenwa/com/tenwa/lease/flow/project/validate/ValidatePropertiesUtil.java Normal file
View File

@ -0,0 +1,40 @@
package com.tenwa.lease.flow.project.validate;
import java.io.IOException;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import com.amarsoft.are.ARE;
/**
* 信贷校验配置文件读取类
* @author 张磊
* 2018年6月25日 下午5:15:34
*/
public class ValidatePropertiesUtil {
private static final Map<String,String> attributes ;
static{
attributes = new ConcurrentHashMap<String,String>();
Properties prop = new Properties();
try {
prop.load(ValidatePropertiesUtil.class.getResourceAsStream("/license.properties"));
for(Entry<Object, Object> entry : prop.entrySet()){
if(entry.getKey()==null || entry.getValue() == null){
continue;
}
attributes.put(entry.getKey().toString(),entry.getValue().toString());
}
} catch (IOException e) {
e.printStackTrace();
ARE.getLog().error("init ValidatePropertiesUtil info failed");
}
ARE.getLog().info("init ValidatePropertiesUtil info success");
}
public static String get(String propName){
return attributes.get(propName);
}
}