Merge remote-tracking branch 'origin/ap007' into ap007

This commit is contained in:
zhanglei 2023-09-18 10:05:11 +08:00
commit fc56fa1f31
6 changed files with 155 additions and 8 deletions

View File

@ -76,6 +76,7 @@
}
var syncResult = RunJavaMethodTrans("com.ample.esb.controller.AccountSyncController","accountSyncDo","userId="+sUserID+",userName="+sUserName+",afsState="+afsState+",operatorId="+operatorId);
alert(syncResult);
reloadSelf();
});
}

View File

@ -7,7 +7,7 @@
History Log:
*/
String TYPENO= CurPage.getParameter("TYPENO");
ASObjectModel doTemp = new ASObjectModel("LmProductAndCarList");
ASObjectModel doTemp = new ASObjectModel("BaicProductAndCarList");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.ReadOnly = "1"; //只读模式
@ -28,7 +28,7 @@
var Return="<%=CurUser.getUserID()%>@~<%=CurUser.getOrgID()%>@~<%=StringFunction.getTodayNow()%>@~<%=TYPENO%>@~";
productid="<%=TYPENO%>";
AsDialog.OpenSelector("SelectCarInfo","productid,"+productid,"dialogWidth=" + parseInt(window.screen.width * 0.6) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",
AsDialog.OpenSelector("SelectCarInfoBaic","productid,"+productid,"dialogWidth=" + parseInt(window.screen.width * 0.6) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",
function(sReturn){
if(!sReturn||sReturn=="_CANCEL_"||sReturn=="")
{

View File

@ -866,5 +866,26 @@
</managerProperties>
</manager>
</class>
<class name="RC_CAR_MODEL" label="车辆信息库" describe="北财车型" keyAttributes="ID">
<attributes>
<attribute name="ID" label="唯一标识" type="String" length="32" />
<attribute name="brand_id" label="品牌id" type="STRING" length="26" />
<attribute name="brand_name" label="品牌名称" type="STRING" length="30"/>
<attribute name="series_id" label="车系id" type="STRING" length="10"/>
<attribute name="series_name" label="车系名称" type="STRING" length="30"/>
<attribute name="model_id" label="车型id" type="STRING" length="15"/>
<attribute name="model_code" label="车型配置编码" type="STRING" length="30"/>
<attribute name="model_name" label="车型名称" type="STRING" length="50"/>
<attribute name="model_plants_price" label="厂家指导价" type="STRING" length="15"/>
<attribute name="model_average_price" label="零售均价" type="STRING" length="15"/>
<attribute name="car_type" label="车辆类型" type="STRING" length="10"/>
<attribute name="car_type_code" label="车辆类型编码" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>
<property name="table" value="RC_CAR_MODEL"/>
</managerProperties>
</manager>
</class>
</package>
</jbo>

View File

@ -0,0 +1,43 @@
package com.ample.esb.check;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.JBOFactory;
import com.amarsoft.awe.util.Transaction;
import com.tenwa.template.check.DefaultBussinessCheck;
import jbo.oti.RC_SCORE_RESULT;
/**
* 风控中台结果校验
*
*/
public class AMPResutCheck extends DefaultBussinessCheck{
@Override
public Object run(Transaction Sqlca) throws Exception {
String ObjectNo = this.getAttribute("ObjectNo").toString();
BizObject boRSR = JBOFactory.createBizObjectQuery(RC_SCORE_RESULT.CLASS_NAME,"select score_result_code,fraud_alert_code,fraud_taken_code from O where flow_no=:flowNo").setParameter("flowNo",ObjectNo).getSingleResult(false);
String socreCode = boRSR.getAttribute("score_result_code").toString();
String alertCode = boRSR.getAttribute("fraud_alert_code").toString();
String takenCode = boRSR.getAttribute("fraud_taken_code").toString();
if("".equals(socreCode)){
putMsg("请先评分获取评分结果");
setPass(false);
return null;
}
if("RR".equals(socreCode)||"RD".equals(socreCode)){
if("".equals(takenCode)){
putMsg("请先获取反欺诈人工判定结果");
setPass(false);
return null;
}
if("".equals(alertCode)){
putMsg("请先获取反欺诈预警结果");
setPass(false);
return null;
}
}
putMsg("验证通过!");
setPass(true);
return null;
}
}

View File

@ -237,7 +237,8 @@ public class AmpServiceImpl extends EsbCommon implements AmpService {
li.setMakerInterestTotal(makerInterestTotal);
li.setMakerInterestTotalDeposit("");
li.setIsSubsity(IsSubsity);
li.setContractPriceTotal(boLcct.getAttribute("EQUIP_AMT").toString());
//风险张琬璐要求改为商务条件页面的总价款
li.setContractPriceTotal(boLcct.getAttribute("TOTAL_ALL").toString());
li.setMonthInterestRate(interestRate.divide(new BigDecimal("12"),4,BigDecimal.ROUND_HALF_UP).toString());
li.setPayType("银行卡直扣");
li.setPayRemark("");
@ -385,7 +386,6 @@ public class AmpServiceImpl extends EsbCommon implements AmpService {
int ageInYear = DateUtils.yearDiffByDate(idBirthday,nowDay);
int ageInMonth = DateUtils.monthDiffByDate(idBirthday,nowDay);
String workAddressId = boCpt.getAttribute("work_address_id").getString();
BizObject boRai = this.getAddressById(workAddressId);
String workProvinceCode = boRai.getAttribute("province_code").toString();
String workCityCode = boRai.getAttribute("city_code").toString();
@ -472,7 +472,8 @@ public class AmpServiceImpl extends EsbCommon implements AmpService {
ci.setAreaCode("");
ci.setExtentionNbr("");
ci.setPhoneTypeCde("");
ci.setDesignationCde("");
//职务 风险张琬璐要求用这个字段
ci.setDesignationCde(empPositionCode);
ci.setCityCde("");
ci.setStateCde("");
//省市区
@ -626,7 +627,8 @@ public class AmpServiceImpl extends EsbCommon implements AmpService {
co.setAreaCode("");
co.setExtentionNbr("");
co.setPhoneTypeCde("");
co.setDesignationCde("");
//职务 风险张琬璐要求用这个字段
co.setDesignationCde(empPositionCode);
co.setCityCde("");
co.setStateCde("");
//省市区
@ -817,7 +819,8 @@ public class AmpServiceImpl extends EsbCommon implements AmpService {
gr.setAreaCode("");
gr.setExtentionNbr("");
gr.setPhoneTypeCde("");
gr.setDesignationCde("");
//职务 风险张琬璐要求用这个字段
gr.setDesignationCde(empPositionCode);
gr.setCityCde("");
gr.setStateCde("");
//省市区
@ -1017,8 +1020,24 @@ public class AmpServiceImpl extends EsbCommon implements AmpService {
}
public BizObject getAddressById(String addressId) throws JBOException {
BizObject boRai = null;
if(addressId==null || "".equals(addressId)){
boRai.setAttributeValue("province_code","");
boRai.setAttributeValue("city_code","");
boRai.setAttributeValue("district_code","");
boRai.setAttributeValue("address_detail","空地址");
return boRai;
}
BizObjectManager rcAddressInfo = JBOFactory.getBizObjectManager(RC_ADDRESS_INFO.CLASS_NAME);
BizObject boRai = rcAddressInfo.createQuery("address_id=:id").setParameter("id", addressId).getSingleResult(false);
boRai = rcAddressInfo.createQuery("address_id=:id").setParameter("id", addressId).getSingleResult(false);
if(boRai == null){
boRai.setAttributeValue("province_code","");
boRai.setAttributeValue("city_code","");
boRai.setAttributeValue("district_code","");
boRai.setAttributeValue("address_detail","未查得地址");
}
return boRai;
}

View File

@ -0,0 +1,63 @@
package jbo.oti;
/**
* 北财车型库 - JBO命名常量类<br><br>
* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
*/
public interface RC_CAR_MODEL {
/**
* 北财车型库<br><br>
* 代表本类映射的BizObjectClass
*/
public static final String CLASS_NAME = "jbo.oti.RC_CAR_MODEL";
/**
* 唯一标识 LONG(64)<br>
*/
public static final String ID = "ID";
/**
* 品牌唯一标识 LONG(64)<br>
*/
public static final String brand_id = "brand_id";
/**
* 品牌名称 LONG(64)<br>
*/
public static final String brand_name = "brand_name";
/**
* 车系ID<br>
*/
public static final String series_id = "series_id";
/**
* 车系名 STRING(20)<br>
*/
public static final String series_name = "series_name";
/**
* 车型id STRING(50)<br>
*/
public static final String model_id = "model_id";
/**
* 车型配置编码 STRING(32)<br>
*/
public static final String model_code = "model_code";
/**
* 车型名称 STRING(32)<br>
*/
public static final String model_name = "model_name";
/**
* 指导价 STRING(32)<br>
*/
public static final String model_plants_price = "model_plants_price";
/**
* 零售均价 STRING(100)<br>
*/
public static final String model_average_price = "model_average_price";
/**
* 车辆类型 STRING(100)<br>
*/
public static final String car_type = "car_type";
/**
* 车辆类型编码 STRING(990)<br>
*/
public static final String car_type_code = "car_type_code";
}