From 1223edea2f56e5c3c0e36ea844c12ef55908e3c2 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 09 五月 2025 17:33:34 +0800
Subject: [PATCH] 回款登记功能开发
---
src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java | 63 ++++++++++
src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java | 79 +++++++++++++
src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java | 2
src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java | 13 ++
src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java | 40 ++++++
src/main/resources/mapper/sales/ReceiptPaymentMapper.xml | 28 ++++
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 64 ++++++++++
src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java | 2
src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java | 19 +++
9 files changed, 307 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java b/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java
index 5dd3c0f..00e1e88 100644
--- a/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java
+++ b/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java
@@ -34,7 +34,7 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult invoiceRegistrationDel(List<Integer> ids) {
+ public AjaxResult invoiceRegistrationDel(@RequestParam List<Integer> ids) {
invoiceRegistrationService.invoiceRegistrationDel(ids);
return AjaxResult.success();
}
diff --git a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
new file mode 100644
index 0000000..f5d7146
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
@@ -0,0 +1,63 @@
+package com.ruoyi.sales.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.sales.dto.ReceiptPaymentDto;
+import com.ruoyi.sales.pojo.ReceiptPayment;
+import com.ruoyi.sales.service.ReceiptPaymentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/receiptPayment")
+public class ReceiptPaymentController {
+
+ @Autowired
+ private ReceiptPaymentService receiptPaymentService;
+
+ /**
+ * 鍥炴鐧昏鏂板
+ * @param receiptPayment
+ * @return
+ */
+ @PostMapping("/add")
+ public AjaxResult receiptPaymentAdd (@RequestBody ReceiptPayment receiptPayment) {
+ receiptPaymentService.receiptPaymentAdd(receiptPayment);
+ return AjaxResult.success();
+ }
+
+ /**
+ * 鍥炴鐧昏淇敼
+ * @param receiptPayment
+ * @return
+ */
+ @PostMapping("/update")
+ public AjaxResult receiptPaymentUpdate (@RequestBody ReceiptPayment receiptPayment) {
+ return AjaxResult.success(receiptPaymentService.receiptPaymentUpdate(receiptPayment));
+ }
+
+ /**
+ * 鍥炴鐧昏鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @DeleteMapping("/del")
+ public AjaxResult receiptPaymentDel (@RequestBody List<Integer> ids) {
+ return AjaxResult.success(receiptPaymentService.receiptPaymentDel(ids));
+ }
+
+ /**
+ * 鍥炴鐧昏鍒嗛〉鏌ヨ
+ * @param page
+ * @param receiptPaymentDto
+ * @return
+ */
+ @GetMapping("/listPage")
+ public AjaxResult receiptPaymentListPage (Page page, ReceiptPaymentDto receiptPaymentDto) {
+ return AjaxResult.success(receiptPaymentService.receiptPaymentListPage(page,receiptPaymentDto));
+ }
+
+
+}
diff --git a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
new file mode 100644
index 0000000..68c7402
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
@@ -0,0 +1,19 @@
+package com.ruoyi.sales.dto;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.sales.pojo.ReceiptPayment;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class ReceiptPaymentDto extends ReceiptPayment {
+
+}
diff --git a/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java b/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
new file mode 100644
index 0000000..dc6162f
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
@@ -0,0 +1,13 @@
+package com.ruoyi.sales.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.sales.dto.ReceiptPaymentDto;
+import com.ruoyi.sales.pojo.ReceiptPayment;
+import org.apache.ibatis.annotations.Param;
+
+public interface ReceiptPaymentMapper extends BaseMapper<ReceiptPayment> {
+
+ IPage<ReceiptPaymentDto> receiptPaymentListPage(Page page, @Param("receiptPaymentDto") ReceiptPaymentDto receiptPaymentDto);
+}
diff --git a/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java b/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
new file mode 100644
index 0000000..33fb9b3
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
@@ -0,0 +1,79 @@
+package com.ruoyi.sales.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class ReceiptPayment {
+
+ /**
+ * 搴忓彿
+ */
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "閿�鍞彴璐ales_ledger")
+ private Integer salesLedgerId;
+
+ @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
+ private String salesContractNo;
+
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇ОID")
+ private Integer customerId;
+
+ @ApiModelProperty(value = "鍙戠エ鍙�")
+ private String invoiceNo;
+
+ @ApiModelProperty(value = "鍙戠エ閲戦")
+ private BigDecimal invoiceAmount;
+
+ @ApiModelProperty(value = "绋庣巼")
+ private BigDecimal taxRate;
+
+ @ApiModelProperty(value = "鍥炴褰㈠紡 0鐢垫眹1鎵垮厬")
+ private String receiptPaymentType;
+
+ @ApiModelProperty(value = "鍥炴閲戦")
+ private BigDecimal receiptPaymentAmount;
+
+ @ApiModelProperty(value = "鐧昏浜�")
+ private String registrant;
+
+ @ApiModelProperty(value = "invoice_ledger寮�绁ㄥ彴璐︿富閿甀D")
+ private Integer invoiceLedgerId;
+
+ @ApiModelProperty(value = "鏉ユ鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime receiptPaymentDate;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @ApiModelProperty(value = "绉熸埛ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer tenantId;
+
+}
diff --git a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
new file mode 100644
index 0000000..c31176e
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
@@ -0,0 +1,40 @@
+package com.ruoyi.sales.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.sales.dto.ReceiptPaymentDto;
+import com.ruoyi.sales.pojo.ReceiptPayment;
+
+import java.util.List;
+
+public interface ReceiptPaymentService {
+
+ /**
+ * 鍥炴鐧昏鏂板
+ * @param receiptPayment
+ * @return
+ */
+ int receiptPaymentAdd(ReceiptPayment receiptPayment);
+
+ /**
+ * 鍥炴鐧昏淇敼
+ * @param receiptPayment
+ * @return
+ */
+ int receiptPaymentUpdate(ReceiptPayment receiptPayment);
+
+ /**
+ * 鍥炴鐧昏鍒犻櫎
+ * @param ids
+ * @return
+ */
+ int receiptPaymentDel(List<Integer> ids);
+
+ /**
+ * 鍥炴鐧昏鍒嗛〉鏌ヨ
+ * @param page
+ * @param receiptPaymentDto
+ * @return
+ */
+ IPage<ReceiptPaymentDto> receiptPaymentListPage (Page page, ReceiptPaymentDto receiptPaymentDto);
+}
diff --git a/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
index 8057419..012792a 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
@@ -16,8 +16,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Collections;
import java.util.List;
@Service
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
new file mode 100644
index 0000000..0b34ba0
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -0,0 +1,64 @@
+package com.ruoyi.sales.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.sales.dto.ReceiptPaymentDto;
+import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
+import com.ruoyi.sales.pojo.ReceiptPayment;
+import com.ruoyi.sales.service.ReceiptPaymentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ReceiptPaymentServiceImpl extends ServiceImpl<ReceiptPaymentMapper,ReceiptPayment> implements ReceiptPaymentService {
+
+ @Autowired
+ private ReceiptPaymentMapper receiptPaymentMapper;
+
+ /**
+ * 鍥炴鐧昏鏂板
+ * @param receiptPayment
+ * @return
+ */
+ @Override
+ public int receiptPaymentAdd(ReceiptPayment receiptPayment) {
+ return receiptPaymentMapper.insert(receiptPayment);
+ }
+
+ /**
+ * 鍥炴鐧昏淇敼
+ * @param receiptPayment
+ * @return
+ */
+ @Override
+ public int receiptPaymentUpdate(ReceiptPayment receiptPayment) {
+ return receiptPaymentMapper.updateById(receiptPayment);
+ }
+
+ /**
+ * 鍥炴鐧昏鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @Override
+ public int receiptPaymentDel(List<Integer> ids) {
+ LambdaQueryWrapper<ReceiptPayment> delQuery = new LambdaQueryWrapper<>();
+ delQuery.in(ReceiptPayment::getId, ids);
+ return receiptPaymentMapper.delete(delQuery);
+ }
+
+ /**
+ * 鍥炴鐧昏鍒嗛〉鏌ヨ
+ * @param page
+ * @param receiptPaymentDto
+ * @return
+ */
+ @Override
+ public IPage<ReceiptPaymentDto> receiptPaymentListPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
+ return receiptPaymentMapper.receiptPaymentListPage(page, receiptPaymentDto);
+ }
+}
diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
new file mode 100644
index 0000000..8490cba
--- /dev/null
+++ b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.sales.mapper.ReceiptPaymentMapper">
+ <select id="invoiceLedgerPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
+ SELECT
+ T1.id ,
+ T1.sales_ledger_id ,
+ T1.sales_contract_no ,
+ T1.customer_id ,
+ T1.invoice_no ,
+ T1.invoice_amount ,
+ T1.tax_rate ,
+ T1.receipt_payment_type ,
+ T1.receipt_payment_amount ,
+ T1.registrant ,
+ T1.receipt_payment_date ,
+ T1.create_time ,
+ T1.create_user ,
+ T1.update_time ,
+ T1.update_user ,
+ T1.tenant_id ,
+ FROM receipt_payment T1
+ LEFT JOIN customer T2 ON T1.customer_id = T2.id
+ </select>
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3