缴费审核

jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java

@@ -66,6 +66,30 @@ public class PayPaymentCheckController extends JeroController<PayPaymentRecordSu
        return Result.OK("操作成功");
    }
 
+   @ApiOperation(value="删除", notes="删除")
+   @PostMapping(value = "/delete")
+   public Result<?> delete(@RequestBody PayPaymentRecord payPaymentRecord) {
+       try{
+           payPaymentCheckService.delete(payPaymentRecord);
+       }catch (Exception e){
+           log.error("删除异常",e);
+           return Result.error(e.getMessage());
+       }
+       return Result.OK("操作成功");
+   }
+
+   @ApiOperation(value="编辑", notes="编辑")
+   @PostMapping(value = "/edit")
+   public Result<?> edit(@RequestBody PayPaymentRecord payPaymentRecord) {
+       try{
+           payPaymentCheckService.edit(payPaymentRecord);
+       }catch (Exception e){
+           log.error("编辑异常",e);
+           return Result.error(e.getMessage());
+       }
+       return Result.OK("操作成功");
+   }
+
    @ApiOperation(value="审核", notes="审核")
    @PostMapping(value = "/check")
    @RequiresPermissions("incomePaymentAndInvoiving:audit")

jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java

@@ -29,6 +29,18 @@ public interface IPayPaymentCheckService extends IService<PayPaymentRecordSub> {
      */
     void applicant(PayPaymentRecord payPaymentRecord);
 
+    /**
+     *  删除
+     * @param payPaymentRecord
+     */
+    void delete(PayPaymentRecord payPaymentRecord);
+
+    /**
+     *  编辑
+     * @param payPaymentRecord
+     */
+    void edit(PayPaymentRecord payPaymentRecord);
+
     /**
      * 审核
      * @param payPaymentRecord

jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java

@@ -144,6 +144,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
         //列表
         LambdaQueryWrapper<PayPaymentRecordSub> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(PayPaymentRecordSub::getProjectId, id);
+        wrapper.ne(PayPaymentRecordSub::getPaymentStatus, PaymentStatusEnum.TO_BE_REVIEWED.getCode());
         wrapper.orderByAsc(PayPaymentRecordSub::getPaymentDate);
         List<PayPaymentRecordSub> list = payPaymentCheckService.list(wrapper);
         list.forEach(p -> {
@@ -262,12 +263,122 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
         payPaymentRecordMapper.insert(payPaymentRecord);
 
         PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
-        payPaymentRecordSub.setRecordId(payPaymentRecord.getId());
         BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
         payPaymentCheckMapper.insert(payPaymentRecordSub);
 
 //        uploadSendMessage();
     }
+
+    /**
+     *  删除
+     * @param payPaymentRecord
+     */
+    public void delete(PayPaymentRecord payPaymentRecord){
+        if(PaymentStatusEnum.REJECTED.getCode().equals(payPaymentRecord.getPaymentStatus())){
+            throw new JeroBootException("只有拒绝的才可删除");
+        }
+        payPaymentRecordMapper.deleteById(payPaymentRecord.getId());
+    }
+
+    /**
+     *  编辑
+     * @param payPaymentRecord
+     */
+    public void edit(PayPaymentRecord payPaymentRecord){
+        if(PaymentStatusEnum.REJECTED.getCode().equals(payPaymentRecord.getPaymentStatus())){
+            throw new JeroBootException("只有拒绝的才可编辑");
+        }
+
+        switch (String.valueOf(payPaymentRecord.getProjectType())){
+            // 普通项目
+            case PayIncomeContractCommon.PROJECT_TYPE1:
+                //来款条件校验
+                payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
+
+                PayCommonProject payCommonProject = new PayCommonProject();
+                payCommonProject.setId(payPaymentRecord.getProjectId());
+                payCommonProject.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
+                payCommonProjectMapper.updateById(payCommonProject);
+
+                break;
+            // 工作组项目
+            case PayIncomeContractCommon.PROJECT_TYPE2:
+                //来款条件校验
+                payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
+
+                PayWorkingGroupSubItem payWorking = new PayWorkingGroupSubItem();
+
+                payWorking.setId(payPaymentRecord.getProjectId());
+                payWorking.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
+                payWorkingGroupSubItemMapper.updateById(payWorking);
+
+//                projectId = payWorking.getId();
+//                projectName=payWorking.getChargeProject();
+                break;
+            //会议项目
+            case PayIncomeContractCommon.PROJECT_TYPE3:
+                //来款条件校验
+                payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
+
+                PayMeetingSituation meeting = new PayMeetingSituation();
+                meeting.setId(payPaymentRecord.getProjectId());
+                meeting.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
+                payMeetingSituationMapper.updateById(meeting);
+
+                break;
+            //会员项目
+            case PayIncomeContractCommon.PROJECT_TYPE4:
+                //来款条件校验
+                payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
+
+                PayMemberProjectSubitem member = new PayMemberProjectSubitem();
+                member.setId(payPaymentRecord.getProjectId());
+                member.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
+                payMemberProjectSubitemMapper.updateById(member);
+
+                break;
+            //标协会员
+            case PayIncomeContractCommon.PROJECT_TYPE5:
+                //标协类型条件校验
+                payPaymentRecordService.type5AddCheck(payPaymentRecord);
+                //来款条件校验
+                payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
+
+                TbMemberProjectSubitem tbMember= new TbMemberProjectSubitem();
+                tbMember.setId(payPaymentRecord.getProjectId());
+                tbMember.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
+                tbMemberProjectSubitemMapper.updateById(tbMember);
+
+                break;
+            //标协证书
+            case PayIncomeContractCommon.PROJECT_TYPE6:
+                //标协类型条件校验
+                payPaymentRecordService.type6AddCheck(payPaymentRecord);
+                //来款条件校验
+                payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
+
+                TbCertificatePayment certificatePayment= new TbCertificatePayment();
+                certificatePayment.setId(payPaymentRecord.getProjectId());
+                certificatePayment.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
+                certificatePaymentMapper.updateById(certificatePayment);
+
+                break;
+            default:break;
+        }
+
+        //更新来款记录表
+        LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+        payPaymentRecord.setApplicantName(sysUser.getRealname());
+        payPaymentRecord.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
+        payPaymentRecordMapper.updateById(payPaymentRecord);
+
+        //新增子表
+        PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
+        BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
+        payPaymentRecordSub.setId(null);
+        payPaymentCheckMapper.insert(payPaymentRecordSub);
+    }
+
     /**
     * @Description 企业人员上传完汇款凭证之后 来款管理者 给财务人员 发送消息
     * @Date 2021/12/16 11:16
@@ -519,7 +630,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
         // 应收>0 && 实收金额 == 应收金额
         if(amountReceivable.compareTo(new BigDecimal("0.00")) > 0
                 && paidAmount.compareTo(amountReceivable) == 0){
-            paymentStatus = PaymentStatusEnum.COMPLETED.getCode();//待完结
+            paymentStatus = PaymentStatusEnum.COMPLETED.getCode();//已完结
         }
         return paymentStatus;
     }