From 4b5d9894fcef9ad5e0fc2b1d96e0dd66304cb486 Mon Sep 17 00:00:00 2001 From: baozhipeng <961815525@qq.com> Date: Thu, 16 Dec 2021 12:17:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayPaymentCheckController.java | 10 ++-- .../PayPaymentRecordController.java | 9 ++-- .../service/IPayPaymentCheckService.java | 6 +++ .../impl/PayPaymentCheckServiceImpl.java | 50 +++++++++++++++++-- 4 files changed, 61 insertions(+), 14 deletions(-) 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 e33f329c..d48c365f 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 @@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; @Api(tags="到账审核") @@ -33,13 +34,10 @@ public class PayPaymentCheckController extends JeroController amountReceivedList(String id) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayPaymentRecord::getProjectId, id); - wrapper.orderByAsc(PayPaymentRecord::getPaymentDate); - List list = payPaymentRecordService.list(wrapper); + public Result amountReceivedList(String id,String projectType) { + Map map = payPaymentCheckService.amountReceivedList(id, projectType); - return Result.OK(list); + return Result.OK(map); } @ApiOperation(value="申请", notes="申请") 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 b6f93fd6..6ed3a0e8 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 @@ -20,13 +20,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.util.AuthenticationUtils; +import com.jero.contract.common.PayIncomeContractCommon; import com.jero.mail.PayMailBillVO; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.service.IPayMailBillService; +import com.jero.meeting.entity.PayMeetingSituation; +import com.jero.member.entity.PayMemberProjectSubitem; +import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.payment.entity.PayPaymentRecord; import com.jero.payment.service.IPayPaymentRecordService; import com.jero.project.entity.PayCommonProject; +import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.vo.PayCommonProjectOutput; import com.jero.standards.memberinfo.entity.MemberInfo; import io.lettuce.core.dynamic.annotation.Param; @@ -53,10 +58,6 @@ public class PayPaymentRecordController extends JeroController { + /** + * 来款列表 + */ + Map amountReceivedList(String id, String projectType); + /** * 申请 * @param 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 77a8f137..d86457f4 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 @@ -42,10 +42,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Objects; +import java.util.*; /** * 到账审核 @@ -76,6 +73,51 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl amountReceivedList(String id, String projectType){ + //列表 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayPaymentRecord::getProjectId, id); + wrapper.orderByAsc(PayPaymentRecord::getPaymentDate); + List list = payPaymentRecordService.list(wrapper); + + //实收、应收 + BigDecimal paidAmount=new BigDecimal("0");; + BigDecimal receivableAmount=new BigDecimal("0");; + + switch (String.valueOf(projectType)){ + + // 普通项目 + case PayIncomeContractCommon.PROJECT_TYPE1: + PayCommonProject payCommonProject = payCommonProjectMapper.selectById(id); + paidAmount = payCommonProject.getPaidAmount(); + receivableAmount = payCommonProject.getReceivableAmount(); + break; + // 工作组项目 + case PayIncomeContractCommon.PROJECT_TYPE2: + PayWorkingGroupSubItem payWorking = payWorkingGroupSubItemMapper.selectById(id); + paidAmount = payWorking.getPaidAmount(); + receivableAmount = payWorking.getReceivableAmount(); + break; + //会员项目 + case PayIncomeContractCommon.PROJECT_TYPE4: + PayMemberProjectSubitem member = payMemberProjectSubitemMapper.selectById(id); + paidAmount = member.getPaidAmount(); + receivableAmount = member.getAmountReceivable(); + break; + default:break; + } + + Map map = new HashMap<>(); + map.put("list",list); + map.put("paidAmount",paidAmount); + map.put("receivableAmount",receivableAmount); + + return map; + } /** * 申请 * @param payPaymentRecord