diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java index c389bd8f..b05a328b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java @@ -89,6 +89,7 @@ public class PayPaymentRecordController extends JeroController revoke(@RequestParam(name = "id") String id) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index 2d5d33e5..eb9ce536 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -1210,7 +1210,6 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl listId = new ArrayList<>(); switch (String.valueOf(projectType)){ // 普通项目 @@ -1218,11 +1217,6 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,payWorking.getId()); - List listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); - if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ - List listIds = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); - List payWorkingTemporary = payContactsManagementTemporaryService.listByIds(listIds); - if(!CollectionUtils.isEmpty(payWorkingTemporary)){ - listId.addAll(payWorkingTemporary); - } - } newPaidAmount =subtract(payWorking.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收 inAccount = getInAccount(payWorking.getReceivableAmount(), newPaidAmount);//到账状态 @@ -1270,14 +1255,6 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl