diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java index aa7ba2c2..1defc502 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java @@ -32,5 +32,17 @@ public class PayPaymentCheckController extends JeroController check(@RequestBody PayPaymentRecord payPaymentRecord) { + try{ + payPaymentCheckService.check(payPaymentRecord); + }catch (Exception e){ + log.error("审核异常",e); + return Result.error(e.getMessage()); + } + return Result.OK("操作成功"); + } + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java index 3332b826..2b5334c1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java @@ -3,6 +3,7 @@ package com.jero.payment.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.payment.entity.PayPaymentRecordSub; import com.jero.payment.entity.PayPaymentRecord; +import org.springframework.web.bind.annotation.RequestBody; import java.math.BigDecimal; @@ -14,7 +15,13 @@ public interface IPayPaymentCheckService extends IService { * 申请 * @param payPaymentRecord */ - public void applicant(PayPaymentRecord payPaymentRecord); + void applicant(PayPaymentRecord payPaymentRecord); + + /** + * 审核 + * @param payPaymentRecord + */ + void check(PayPaymentRecord payPaymentRecord); /** * 得到缴费状态 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java index b9bfe080..1933570c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java @@ -58,6 +58,21 @@ public interface IPayPaymentRecordService extends IService { void updateStandards(String tbPaymentId, MemberInfo memberInfo); + /** + * 累加实收并四舍五入 + * @param paidAmount 实收 + * @param amountReceived 到账 + * @return + */ + BigDecimal addPaidAmount(BigDecimal paidAmount,BigDecimal amountReceived); + /** + * 得到到账状态 + * @param receivableAmount 应收 + * @param paidAmount 实收 + * @return + */ + Integer getInAccount(BigDecimal receivableAmount,BigDecimal paidAmount); + //标协类型新增时条件校验 void type5AddCheck(PayPaymentRecord payPaymentRecord); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java index 61c94bdb..3baaab12 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java @@ -145,6 +145,116 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl