From 1bc8115cee156deab35e8d9f0940219b616d624b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 16 Sep 2022 16:45:33 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=92=A4=E9=94=80=E6=9D=A5=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayPaymentRecordController.java           |  1 +
 .../impl/PayPaymentRecordServiceImpl.java     | 30 +------------------
 2 files changed, 2 insertions(+), 29 deletions(-)

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<PayPaymentRecord,
 	 }
 
 	 @AutoLog(value = "撤销来款")
+	 @RequiresPermissions("incomePaymentAndInvoiving:revoke")
 	 @ApiOperation(value = "撤销来款", notes = "撤销来款")
 	 @PostMapping(value = "/revoke")
 	 public Result<?> 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<PayPaymentRecordMap
         String paymentStatus;
         BigDecimal tax;
         BigDecimal noTaxAmount;
-        List<PayContactsManagementTemporary> listId = new ArrayList<>();
         switch (String.valueOf(projectType)){
 
             // 普通项目
@@ -1218,11 +1217,6 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                 PayCommonProject payCommonProject = payCommonProjectMapper.selectById(payPaymentRecord.getProjectId());
 
-                PayContactsManagementTemporary payCommonProjectTemporary = payContactsManagementTemporaryService.getById(payCommonProject.getContactsTemporaryId());
-                if(!Objects.isNull(payCommonProjectTemporary)){
-                    listId.add(payCommonProjectTemporary);
-                }
-
                 newPaidAmount =subtract(payCommonProject.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(payCommonProject.getReceivableAmount(), newPaidAmount);//到账状态
                 paymentStatus = payPaymentCheckService.getPaymentStatus(payCommonProject.getReceivableAmount(), newPaidAmount, PaymentStatusEnum.COMPLETED.getCode());//缴费状态
@@ -1240,17 +1234,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
             // 工作组项目
             case PayIncomeContractCommon.PROJECT_TYPE2:
                 PayWorkingGroupSubItem payWorking = payWorkingGroupSubItemMapper.selectById(payPaymentRecord.getProjectId());
-                PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorking.getWorkingGroupId());
                 LambdaQueryWrapper<PayWorkingGroupSubItemContacts> queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>();
                 queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,payWorking.getId());
-                List<PayWorkingGroupSubItemContacts> listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts);
-                if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){
-                    List<String> listIds = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList());
-                    List<PayContactsManagementTemporary> 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<PayPaymentRecordMap
             case PayIncomeContractCommon.PROJECT_TYPE3:
 
                 PayMeetingSituation meeting = payMeetingSituationMapper.selectById(payPaymentRecord.getProjectId());
-                PayMeeting payMeeting =payMeetingService.getById(meeting.getMeetingId());
-
-                PayContactsManagement meetingPayContactsManagement = payContactsManagementService.getById(meeting.getContractId());
-                if(!Objects.isNull(meetingPayContactsManagement)){
-                    String str = JSON.toJSONString(meetingPayContactsManagement);
-                    PayContactsManagementTemporary meetingTemporary = JSONObject.parseObject(str,PayContactsManagementTemporary.class);
-                    listId.add(meetingTemporary);
-                }
 
                 newPaidAmount =subtract(meeting.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(meeting.getAmountReceivable(), newPaidAmount);//到账状态
@@ -1297,12 +1274,6 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
             case PayIncomeContractCommon.PROJECT_TYPE4:
 
                 PayMemberProjectSubitem member = payMemberProjectSubitemMapper.selectById(payPaymentRecord.getProjectId());
-                PayMemberProject payMemberProject = memberProjectService.getById(member.getProjectId());
-
-                PayContactsManagementTemporary memberTemporary = payContactsManagementTemporaryService.getById(member.getCompanyContactTemporaryId());
-                if(!Objects.isNull(memberTemporary)){
-                    listId.add(memberTemporary);
-                }
 
                 newPaidAmount =subtract(member.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
                 inAccount = getInAccount(member.getAmountReceivable(), newPaidAmount);//到账状态
@@ -1327,6 +1298,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 throw new JeroBootException("标协证书类型不可撤销！");
             default:break;
         }
+        this.removeById(id);
     }
 
     /**