From 9c365a4f783fd836965088ca94367670d97317db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 28 Dec 2023 18:14:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86-=E5=88=B0?= =?UTF-8?q?=E8=B4=A6=E5=BC=80=E7=A5=A8=20=E6=B7=BB=E5=8A=A0=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E3=80=81=E7=A1=AE=E8=AE=A4=E6=94=B6=E5=85=A5=E7=9A=84?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=92=A4=E9=94=80?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mail/service/IPayMailBillService.java | 6 ++- .../service/impl/PayMailBillServiceImpl.java | 40 ++++++++++++++++--- .../PayConfirmPaymentRecordController.java | 39 +++++++++++------- .../PayPaymentRecordController.java | 16 ++++++-- .../impl/PayConfirmPaymentRecordService.java | 34 +++++++++++++--- 5 files changed, 106 insertions(+), 29 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java index 109726f4..9ea280f4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java @@ -6,8 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.api.vo.Result; import com.jero.company.entity.PayContactsManagement; -import com.jero.mail.vo.PayMailBillVO; import com.jero.mail.entity.PayMailBill; +import com.jero.mail.entity.PayMailBillProject; +import com.jero.mail.vo.PayMailBillVO; import com.jero.member.enums.StandardsTypeEnum; import java.util.List; @@ -98,4 +99,7 @@ public interface IPayMailBillService extends IService { IPage contactsSearchPageList(Page page, String userId, QueryWrapper queryWrapper); + + void backInvoice(PayMailBillProject payMailBillProject); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index 2968b578..e6daa07b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -25,7 +25,6 @@ import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.config.StaticConfig; import com.jero.contract.common.PayIncomeContractCommon; -import com.jero.mail.vo.PayMailBillVO; import com.jero.mail.entity.BillingInfo; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; @@ -33,6 +32,7 @@ import com.jero.mail.mapper.PayMailBillMapper; import com.jero.mail.mapper.PayMailBillProjectMapper; import com.jero.mail.service.IPayMailBillProjectService; import com.jero.mail.service.IPayMailBillService; +import com.jero.mail.vo.PayMailBillVO; import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.mapper.PayMeetingMapper; @@ -72,10 +72,7 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -603,6 +600,39 @@ public class PayMailBillServiceImpl extends ServiceImpl bmpList) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayConfirmPaymentRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayConfirmPaymentRecordController.java index 85daf193..b56ec1ad 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayConfirmPaymentRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayConfirmPaymentRecordController.java @@ -1,29 +1,27 @@ package com.jero.payment.controller; -import com.jero.payment.entity.PayConfirmPaymentRecord; -import com.jero.payment.service.impl.PayConfirmPaymentRecordService; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.web.bind.annotation.*; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; -import org.springframework.validation.annotation.Validated; +import com.jero.common.system.query.QueryGenerator; +import com.jero.payment.entity.PayConfirmPaymentRecord; +import com.jero.payment.service.impl.PayConfirmPaymentRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; /** * (pay_confirm_payment_record)表控制层 @@ -152,4 +150,15 @@ public class PayConfirmPaymentRecordController extends JeroController backIncoming(@RequestBody PayConfirmPaymentRecord payConfirmPaymentRecord) { + payConfirmPaymentRecordService.backIncoming(payConfirmPaymentRecord); + return Result.OK(); + } } 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 37a65374..4c0a745e 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 @@ -9,8 +9,9 @@ import com.jero.common.enums.PaymentStatusEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.ValidUtil; import com.jero.contract.common.PayIncomeContractCommon; -import com.jero.mail.vo.PayMailBillVO; +import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.service.IPayMailBillService; +import com.jero.mail.vo.PayMailBillVO; import com.jero.member.entity.TbCertificatePayment; import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.service.ITbCertificatePaymentService; @@ -27,6 +28,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; + import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; @@ -266,6 +268,14 @@ public class PayPaymentRecordController extends JeroController backInvoice(@RequestBody PayMailBillProject payMailBillProject) { + payMailBillService.backInvoice(payMailBillProject); + return Result.OK(); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java index 1f247edb..6fce4f03 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java @@ -1,14 +1,20 @@ package com.jero.payment.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; import com.jero.config.StaticConfig; import com.jero.contract.common.PayIncomeContractCommon; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.mapper.PayMeetingSituationMapper; -import com.jero.member.entity.*; +import com.jero.member.entity.PayMemberProjectSubitem; +import com.jero.member.entity.TbCertificatePayment; +import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.mapper.PayMemberProjectSubitemMapper; import com.jero.member.mapper.TbCertificatePaymentMapper; import com.jero.member.mapper.TbMemberProjectSubitemMapper; +import com.jero.payment.entity.PayConfirmPaymentRecord; +import com.jero.payment.mapper.PayConfirmPaymentRecordMapper; import com.jero.payment.mapper.PayPaymentRecordMapper; import com.jero.payment.service.IPayPaymentRecordService; import com.jero.project.entity.PayCommonProject; @@ -17,14 +23,14 @@ import com.jero.project.mapper.PayCommonProjectMapper; import com.jero.project.mapper.PayWorkingGroupSubItemMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; +import java.util.Arrays; import java.util.List; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.payment.entity.PayConfirmPaymentRecord; -import com.jero.payment.mapper.PayConfirmPaymentRecordMapper; +import java.util.Objects; /** * @author liJiaRao @@ -315,7 +321,25 @@ public class PayConfirmPaymentRecordService extends ServiceImpl