diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java index 12ea150..d64e8bb 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java @@ -98,6 +98,14 @@ public interface TbsSeeYonConst { } } + + class PayBillConf{ + public static String Code(){ + return DevEnvironmentConfig.isDev()?"PayBill_Test":"PayBill"; + } + } + + String API_TEST = "/testConnection"; String API_PROCESS_CREATE = "/process/create"; String API_CONTRACT_RELEASE_CANCEL = "/process/cancelReleaseContractApply"; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationCenterCommitBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationCenterCommitBo.java index f7b94cb..5680772 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationCenterCommitBo.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationCenterCommitBo.java @@ -46,4 +46,7 @@ public class VtbVerificationCenterCommitBo { /** 是否释放 */ private Integer inputReleaseFlag; + /** 是否直接支付(这个值取反 0-表示直接支付;1-表示不直接支付) */ + private Integer directPayFlag; + } diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java index 772d7b3..2512805 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java @@ -91,7 +91,7 @@ public interface VtbVerificationService extends IService { */ Map buildSeeYonVerificationData(TbsActivity activity, SysUser sysUser, VtbVerification verification, String saleRegionNames, - String bizRegionNames,BmsSupplier supplier); + String bizRegionNames,BmsSupplier supplier,String templateCode); /** * 审核通过回调 diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 0fe3604..972b9f0 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -933,7 +933,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl data = buildSeeYonVerificationData(activity, sysUser, verification, saleRegionNames, bizRegionNames,supplier); + private void commitSy(TbsActivity activity,SysUser sysUser,VtbVerification verification, + String saleRegionNames,String bizRegionNames,BmsSupplier supplier,Integer isDirectPayFlag){ + String templateCode = TbsSeeYonConst.CostCheckConf.Code(); + if(isDirectPayFlag!=null&&isDirectPayFlag.equals(1)){ + templateCode = TbsSeeYonConst.PayBillConf.Code(); + } + Map data = buildSeeYonVerificationData(activity, sysUser, verification, saleRegionNames, bizRegionNames,supplier,templateCode); String dataJson = JsonUtil.objectToJson(data); log.warn("核销请求JSON,核销号:{}:{}",verification.getVerificationCode(),dataJson); BaseCreateProcessBo createProcess = new BaseCreateProcessBo(); - createProcess.setTemplateCode(TbsSeeYonConst.CostCheckConf.Code()); + createProcess.setTemplateCode(templateCode); createProcess.setMemberLoginName(sysUser.getSyAccount()); createProcess.setSubjectTitle(TbsSeeYonConst.PRE_TITLE_VERIFICATION + verification.getRemark()); createProcess.setTargetId(verification.getId()+""); @@ -1134,14 +1139,14 @@ public class VtbVerificationServiceImpl extends ServiceImpl formIdResult = seeYonService.getFormId(TbsSeeYonConst.CostCheckConf.Code(),verification.getId()); + R formIdResult = seeYonService.getFormId(templateCode,verification.getId()); if(formIdResult.getStatus()==200){ formId = formIdResult.getData(); } verification.setSyFlowId(flowId); verification.setSyFormId(formId); //创建流程后回调 - BaseCreateCallbackBo callbackBo = new BaseCreateCallbackBo(TbsSeeYonConst.CostCheckConf.Code(),verification.getId()+""); + BaseCreateCallbackBo callbackBo = new BaseCreateCallbackBo(templateCode,verification.getId()+""); seeYonService.createCallbackStatus(callbackBo); } @@ -1165,12 +1170,13 @@ public class VtbVerificationServiceImpl extends ServiceImpl buildSeeYonVerificationData(TbsActivity activity, SysUser sysUser, VtbVerification verification, String saleRegionNames, String bizRegionNames,BmsSupplier supplier) { + public Map buildSeeYonVerificationData(TbsActivity activity, SysUser sysUser, VtbVerification verification, String saleRegionNames, String bizRegionNames,BmsSupplier supplier,String templateCode) { Map data = new HashMap<>(20); data.put("costApplyCode", verification.getVerificationCode()); data.put("applyUserCode", sysUser.getCode()); @@ -1183,7 +1189,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl