diff --git a/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java b/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java index 67ad3528..9efd2bbb 100644 --- a/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java +++ b/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java @@ -133,6 +133,19 @@ public class AsyncFactory { finishedParam.setPolicyId(policyId); operationService.doFinished(finishedParam); } + DataAffairCommitService commitService = SpringUtils.getBean(DataAffairCommitService.class); + // 获取最后一条审批判断结果:TbsAffairCommitBo.state 0-否定,1-同意,2-退回 + Integer state = commitService.getState(operationService.getTemplateCode(),policyId+""); + //调用成功回调方法 + TbsAffairCommitBo doParam = new TbsAffairCommitBo(); + doParam.setPolicyId(policyId); + if (state==null||state==1){ + operationService.doFinished(doParam); + }else if (state==2){ + operationService.doBacked(doParam); + }else if (state==0){ + operationService.doRefuse(doParam); + } log.debug("--------------------------SubmitPolicy CallbackTimer summeryResult:{}------------------------------",summeryResult); } catch (Exception e) { e.printStackTrace(); @@ -158,6 +171,7 @@ public class AsyncFactory { AuthContextUtils.setTenant("001"); log.debug("--------------------------SubmitBudgetApply CallbackTimer Sleep Start :{}------------------------------",budgetId); Thread.sleep(3*1000); + TbsBudgetChangeOperationServiceImpl applyOperationService = SpringUtils.getBean(TbsBudgetChangeOperationServiceImpl.class); String summeryResult = applyOperationService.checkAffairSummery(budgetId); @@ -295,21 +309,24 @@ public class AsyncFactory { * @param totalAmount * @return */ - public static TimerTask saveVtbSubmit(String userCode,Long verificationId, BigDecimal totalAmount,Integer state,boolean realaseFlag) { - log.warn("费用释放---verificationId:{} totalAmount:{} state:{} realaseFlag:{}",verificationId,totalAmount,state,realaseFlag); + public static TimerTask saveVtbSubmit(String userCode,Long verificationId, BigDecimal totalAmount,boolean realaseFlag) { + log.warn("费用释放---verificationId:{} totalAmount:{} realaseFlag:{}",verificationId,totalAmount,realaseFlag); return new TimerTask() { @Override public void run() { try { AuthContextUtils.setTenant("001"); - Thread.sleep(20*1000); + Thread.sleep(3*1000); VtbVerificationService vtbVerificationService = SpringUtils.getBean(VtbVerificationService.class); VtbVerification verification = vtbVerificationService.getById(verificationId); if(!verification.getVerificationState().equals(VtbVerificationState.Commiting.getCode())){ return; } - //VtbVerificationOperationServiceImpl verificationOperationService = SpringUtils.getBean(VtbVerificationOperationServiceImpl.class); - //String summeryResult = verificationOperationService.checkAffairSummery(verification.getId().toString()); + VtbVerificationOperationServiceImpl verificationOperationService = SpringUtils.getBean(VtbVerificationOperationServiceImpl.class); + String summeryResult = verificationOperationService.checkAffairSummery(verification.getId().toString()); + DataAffairCommitService commitService = SpringUtils.getBean(DataAffairCommitService.class); + // TbsAffairCommitBo.state 0-否定,1-同意,2-退回 + Integer state = commitService.getState(verificationOperationService.getTemplateCode(),verificationId+""); VtbVerificationApplication verificationApplication = SpringUtils.getBean(VtbVerificationApplication.class); if(state.equals(1)){ //调用成功回调方法 diff --git a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java index 6af1be4a..0b508fc7 100644 --- a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java +++ b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java @@ -198,6 +198,12 @@ public class OmsOrderApi { if(sysUser!=null){ order.setCheckUserInfo(sysUser.toSysUserVo()); } + + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(OmsOrderItem::getOrderId,order.getId()); + List items = omsOrderItemService.list(lqw); + order.setOrderItems(items); + } return R.byPageHelperList(list); } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 9f33933e..c699df08 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -860,8 +860,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl subjectCenterBoList, TbsCostApply costApply, BmsSupplier supplier, List verificationSubjects, List verificationCenters, String verificationCode) { diff --git a/src/main/resources/mapper/goods/GoodsSpuMapper.xml b/src/main/resources/mapper/goods/GoodsSpuMapper.xml index 6fa2202e..7e3551e3 100644 --- a/src/main/resources/mapper/goods/GoodsSpuMapper.xml +++ b/src/main/resources/mapper/goods/GoodsSpuMapper.xml @@ -174,6 +174,7 @@ + order by `goods_spu`.`update_time`