From b055733ca41ef0379ed5fe163a55c4f2d62f123d Mon Sep 17 00:00:00 2001 From: baozhipeng <961815525@qq.com> Date: Thu, 16 Dec 2021 14:37: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 | 15 ++++++++++++ .../PayPaymentRecordController.java | 2 +- .../payment/entity/PayPaymentRecordSub.java | 6 ++++- .../service/IPayPaymentCheckService.java | 6 +++++ .../impl/PayPaymentCheckServiceImpl.java | 23 ++++++++++++++++++- 5 files changed, 49 insertions(+), 3 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 d48c365f..a532cf62 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 @@ -11,6 +11,7 @@ import com.jero.payment.service.IPayPaymentRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -40,6 +41,19 @@ public class PayPaymentCheckController extends JeroController amountReceivedSubList(String id) { + + List list=payPaymentCheckService.amountReceivedSubList(id); + + return Result.OK(list); + } + @ApiOperation(value="申请", notes="申请") @PostMapping(value = "/applicant") public Result applicant(@RequestBody PayPaymentRecord payPaymentRecord) { @@ -54,6 +68,7 @@ public class PayPaymentCheckController extends JeroController check(@RequestBody PayPaymentRecord payPaymentRecord) { try{ payPaymentCheckService.check(payPaymentRecord); 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 6ed3a0e8..a7a3ac0e 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 @@ -137,7 +137,7 @@ public class PayPaymentRecordController extends JeroController wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PayPaymentRecord::getProjectId, id); wrapper.eq(PayPaymentRecord::getPaymentStatus, PaymentStatusEnum.COMPLETED.getCode()); - wrapper.orderByAsc(PayPaymentRecord::getPaymentDate); + wrapper.orderByAsc(PayPaymentRecord::getCreateTime); List list = payPaymentRecordService.list(wrapper); return Result.OK(list); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java index d792eb3a..cf4962b3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java @@ -1,6 +1,7 @@ package com.jero.payment.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -88,9 +89,12 @@ public class PayPaymentRecordSub implements Serializable { * COMPLETED("completed");//已同意 */ @ApiModelProperty(value = "缴费状态") - @Dict(dicCode = "payment_record_status") +// @Dict(dicCode = "payment_record_status") private String paymentStatus; + @TableField(exist = false) + private String paymentStatus_dictText; + @ApiModelProperty(value = "审核人id") private String reviewerId; 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 f8cb5e05..297f7d5a 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 @@ -6,6 +6,7 @@ import com.jero.payment.entity.PayPaymentRecord; import org.springframework.web.bind.annotation.RequestBody; import java.math.BigDecimal; +import java.util.List; import java.util.Map; /** @@ -17,6 +18,11 @@ public interface IPayPaymentCheckService extends IService { */ Map amountReceivedList(String id, String projectType); + /** + * 来款子列表，详细记录列表 + */ + List amountReceivedSubList(String id); + /** * 申请 * @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 a6c714b9..133bf969 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 @@ -57,6 +57,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PayPaymentRecord::getProjectId, id); - wrapper.orderByDesc(PayPaymentRecord::getPaymentDate); + wrapper.orderByDesc(PayPaymentRecord::getCreateTime); List list = payPaymentRecordService.list(wrapper); list.forEach(p-> { if(StringUtils.isNotBlank(p.getPaymentStatus())){ @@ -130,6 +132,25 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl amountReceivedSubList(String id) { + //列表 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayPaymentRecordSub::getProjectId, id); + wrapper.orderByDesc(PayPaymentRecordSub::getCreateTime); + List list = payPaymentCheckService.list(wrapper); + list.forEach(p -> { + if (StringUtils.isNotBlank(p.getPaymentStatus())) { + p.setPaymentStatus_dictText(sysBaseAPI.translateDict("payment_record_status", String.valueOf(p.getPaymentStatus()))); + } + }); + + return list; + } /** * 申请 * @param payPaymentRecord