|
@ -143,6 +143,7 @@ public class PortalOfCostApplication { |
|
|
//保存核销申请
|
|
|
//保存核销申请
|
|
|
VtbVerification verification = new VtbVerification(); |
|
|
VtbVerification verification = new VtbVerification(); |
|
|
verification.setVerificationCode("HX"+ IdUtil.timeStampId()); |
|
|
verification.setVerificationCode("HX"+ IdUtil.timeStampId()); |
|
|
|
|
|
verification.setVerificationMainCode(verification.getVerificationCode()); |
|
|
verification.setFinishedTime(nowTime); |
|
|
verification.setFinishedTime(nowTime); |
|
|
verification.setVerificationState(VtbVerificationState.Finished.getCode()); |
|
|
verification.setVerificationState(VtbVerificationState.Finished.getCode()); |
|
|
verification.setPolicyItemId(policyItem.getId()); |
|
|
verification.setPolicyItemId(policyItem.getId()); |
|
@ -419,6 +420,7 @@ public class PortalOfCostApplication { |
|
|
//保存核销申请
|
|
|
//保存核销申请
|
|
|
VtbVerification verification = new VtbVerification(); |
|
|
VtbVerification verification = new VtbVerification(); |
|
|
verification.setVerificationCode("HX"+ IdUtil.timeStampId()); |
|
|
verification.setVerificationCode("HX"+ IdUtil.timeStampId()); |
|
|
|
|
|
verification.setVerificationMainCode(verification.getVerificationCode()); |
|
|
verification.setFinishedTime(nowTime); |
|
|
verification.setFinishedTime(nowTime); |
|
|
verification.setVerificationState(VtbVerificationState.Finished.getCode()); |
|
|
verification.setVerificationState(VtbVerificationState.Finished.getCode()); |
|
|
verification.setActivityId(activity.getId()); |
|
|
verification.setActivityId(activity.getId()); |
|
@ -772,6 +774,7 @@ public class PortalOfCostApplication { |
|
|
//保存核销申请
|
|
|
//保存核销申请
|
|
|
VtbVerification verification = new VtbVerification(); |
|
|
VtbVerification verification = new VtbVerification(); |
|
|
verification.setVerificationCode("MHX"+ CodeGenUtil.generate(CodeGenUtil.SourceKey.Verification)); |
|
|
verification.setVerificationCode("MHX"+ CodeGenUtil.generate(CodeGenUtil.SourceKey.Verification)); |
|
|
|
|
|
verification.setVerificationMainCode(verification.getVerificationCode()); |
|
|
verification.setCostApplyId(costApply.getId()); |
|
|
verification.setCostApplyId(costApply.getId()); |
|
|
verification.setFinishedTime(nowTime); |
|
|
verification.setFinishedTime(nowTime); |
|
|
verification.setVerificationState(VtbVerificationState.Finished.getCode()); |
|
|
verification.setVerificationState(VtbVerificationState.Finished.getCode()); |
|
@ -811,7 +814,7 @@ public class PortalOfCostApplication { |
|
|
|
|
|
|
|
|
ThirtyVerification tv = new ThirtyVerification(); |
|
|
ThirtyVerification tv = new ThirtyVerification(); |
|
|
tv.setId(IdUtil.getSnowFlakeId()+""); |
|
|
tv.setId(IdUtil.getSnowFlakeId()+""); |
|
|
tv.setVerificationCode(verificationSubject.getVerificationSubCode()); |
|
|
tv.setVerificationCode(verification.getVerificationCode()); |
|
|
tv.setActivityTitle(activityTitle); |
|
|
tv.setActivityTitle(activityTitle); |
|
|
//tv.setActivityCode(activityCode);
|
|
|
//tv.setActivityCode(activityCode);
|
|
|
tv.setCreateDate(timeString); |
|
|
tv.setCreateDate(timeString); |
|
@ -826,13 +829,13 @@ public class PortalOfCostApplication { |
|
|
tv.setCheckTime(timeString); |
|
|
tv.setCheckTime(timeString); |
|
|
tv.setCusCode(supplier.getCode()); |
|
|
tv.setCusCode(supplier.getCode()); |
|
|
tv.setCusName(supplier.getName()); |
|
|
tv.setCusName(supplier.getName()); |
|
|
tv.setRecId(verificationSubject.getVerificationSubCode()); |
|
|
tv.setRecId(verification.getVerificationCode()); |
|
|
String COST_TO_PAY_API = projectApisProperties.getCostToPay(); |
|
|
String COST_TO_PAY_API = projectApisProperties.getCostToPay(); |
|
|
String json = JsonUtil.objectToJson(tv); |
|
|
String json = JsonUtil.objectToJson(tv); |
|
|
log.info("COST_TO_PAY_API 支付单信息:{} 数据:{}",verificationSubject.getVerificationSubCode(),json); |
|
|
log.info("COST_TO_PAY_API 支付单信息:{} 数据:{}",verification.getVerificationCode(),json); |
|
|
String rs = HttpUtil.doPost(COST_TO_PAY_API,json,null); |
|
|
String rs = HttpUtil.doPost(COST_TO_PAY_API,json,null); |
|
|
if(rs==null||!rs.contains("200")){ |
|
|
if(rs==null||!rs.contains("200")){ |
|
|
log.error("COST_TO_PAY_API \n 请求参数:{},\n 支付单信息:{},\n 结果:{}",json,verificationSubject.getVerificationSubCode(),rs); |
|
|
log.error("COST_TO_PAY_API \n 请求参数:{},\n 支付单信息:{},\n 结果:{}",json,verification.getVerificationCode(),rs); |
|
|
//核销调度接口事务补偿
|
|
|
//核销调度接口事务补偿
|
|
|
costApplyService.removeById(costApply.getId()); |
|
|
costApplyService.removeById(costApply.getId()); |
|
|
activityService.removeById(activity.getId()); |
|
|
activityService.removeById(activity.getId()); |
|
@ -854,7 +857,7 @@ public class PortalOfCostApplication { |
|
|
verificationSubjectService.removeById(verificationSubject.getId()); |
|
|
verificationSubjectService.removeById(verificationSubject.getId()); |
|
|
Assert.throwEx("连接支付接口异常"); |
|
|
Assert.throwEx("连接支付接口异常"); |
|
|
} |
|
|
} |
|
|
log.info("COST_TO_PAY_API 支付单信息:{},结果:{}",verificationSubject.getVerificationSubCode(),rs); |
|
|
log.info("COST_TO_PAY_API 支付单信息:{},结果:{}",verification.getVerificationCode(),rs); |
|
|
//保存支付
|
|
|
//保存支付
|
|
|
// PayPayment payPayment = new PayPayment();
|
|
|
// PayPayment payPayment = new PayPayment();
|
|
|
// payPayment.setPayType(PaymentType.PAYMENT);
|
|
|
// payPayment.setPayType(PaymentType.PAYMENT);
|
|
|