diff --git a/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java b/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java index b3e19a99..078679ab 100644 --- a/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java +++ b/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java @@ -75,6 +75,7 @@ public class OmsOrderController { List supplierAddressList = bmsSupplierAddressService.listByIds(addrIds); Set userIds = list.stream().map(OmsOrder::getCheckUserId).collect(Collectors.toSet()); + userIds.add("0"); List userList = sysUserService.listByIds(userIds); Set orderIds = list.stream().map(OmsOrder::getId).collect(Collectors.toSet()); diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index 0ec6a1fa..abc36e07 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java @@ -193,8 +193,12 @@ public class VtbVerificationController { public R getById(@PathVariable("id") String id){ VtbVerification vtbVerification = vtbVerificationService.getById(id); if(vtbVerification.getVerificationState().equals(VtbVerificationState.Commiting.getCode())){ - vtbVerificationOperationService.runCompensate(id); - vtbVerification = vtbVerificationService.getById(id); + try { + vtbVerificationOperationService.runCompensate(id); + vtbVerification = vtbVerificationService.getById(id); + } catch (Exception e) { + e.printStackTrace(); + } } vtbVerificationApplication2.buildRelateInfo(vtbVerification); return R.ok(vtbVerification); diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBo.java b/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBo.java index ec5c50db..9c98ba65 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBo.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBo.java @@ -60,7 +60,7 @@ public class VtbVerificationBo implements Serializable { /** 原来的审批id */ private Long orgVerificationId; - /** 是否释放 */ + /** 是否释放(这个值取反 0-表示释放;1-表示不释放) */ private Integer inputReleaseFlag; } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java index 4c3b82a1..ede84920 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java @@ -406,6 +406,7 @@ public class VtbVerificationBatchOperationServiceImpl implements VtbVerification if(isFinish){ verificationApplication.finishCallBack(verification, totalAmount); if(isRelease){ + log.warn("核销"+verification.getVerificationCode()+"释放金额"); vtbVerificationService.release(verification.getActivityId(),sysUser.getCode(),false); } }else { diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java index 3af517aa..771b0632 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java @@ -462,8 +462,10 @@ public class VtbVerificationBatchServiceImpl extends ServiceImpl