From db807b8e9464af69217f813240e55d9e9b3b4cdb Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 10 三月 2026 13:23:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrderProductsController.java | 18 +
src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrderProductsServiceImpl.java | 20 +
src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java | 18 +
src/main/java/com/ruoyi/account/dto/SalesReceiptReturnDto.java | 8
src/main/java/com/ruoyi/account/mapper/SalesReceiptReturnMapper.java | 18 +
src/main/java/com/ruoyi/procurementrecord/dto/ReturnSaleProductDto.java | 6
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java | 2
src/main/java/com/ruoyi/account/service/impl/SalesRefundAmountOrderServiceImpl.java | 43 +++
src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrderProductsService.java | 16 +
src/main/java/com/ruoyi/account/pojo/SalesReceiptReturn.java | 71 +++++
src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml | 6
src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrderProductsMapper.java | 18 +
src/main/java/com/ruoyi/account/controller/SalesReceiptReturnController.java | 37 +++
src/main/resources/mapper/account/SalesReceiptReturnMapper.xml | 21 +
src/main/java/com/ruoyi/account/controller/SalesRefundAmountOrderController.java | 42 +++
src/main/java/com/ruoyi/account/pojo/SalesRefundAmountOrder.java | 70 +++++
src/main/java/com/ruoyi/procurementrecord/mapper/ReturnSaleProductMapper.java | 2
src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrdersService.java | 2
src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml | 42 +++
src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java | 6
src/main/resources/mapper/purchase/PurchaseReturnOrderProductsMapper.xml | 15 +
src/main/java/com/ruoyi/account/mapper/SalesRefundAmountOrderMapper.java | 23 +
src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java | 51 ++++
src/main/java/com/ruoyi/account/service/SalesRefundAmountOrderService.java | 26 ++
src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java | 23 +
src/main/java/com/ruoyi/account/dto/SalesRefundAmountOrderDto.java | 25 ++
src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderProductsDto.java | 13 +
src/main/java/com/ruoyi/procurementrecord/service/ReturnSaleProductService.java | 2
src/main/java/com/ruoyi/account/service/SalesReceiptReturnService.java | 20 +
src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnSaleProductServiceImpl.java | 5
src/main/java/com/ruoyi/account/service/impl/SalesReceiptReturnServiceImpl.java | 27 ++
31 files changed, 695 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/SalesReceiptReturnController.java b/src/main/java/com/ruoyi/account/controller/SalesReceiptReturnController.java
new file mode 100644
index 0000000..7f256ab
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/controller/SalesReceiptReturnController.java
@@ -0,0 +1,37 @@
+package com.ruoyi.account.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.account.dto.SalesReceiptReturnDto;
+import com.ruoyi.account.pojo.SalesReceiptReturn;
+import com.ruoyi.account.service.SalesReceiptReturnService;
+import com.ruoyi.account.service.impl.SalesReceiptReturnServiceImpl;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鏀舵閫�璐ц〃 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-09 03:34:18
+ */
+@RestController
+@RequestMapping("/salesReceiptReturn")
+public class SalesReceiptReturnController {
+
+ @Autowired
+ private SalesReceiptReturnService salesReceiptReturnService;
+
+
+
+ @GetMapping("/page")
+ @ApiOperation("鏀舵閫�璐ц〃-鍒嗛〉鏌ヨ")
+ public R<IPage<SalesReceiptReturnDto>> page(SalesReceiptReturnDto salesReceiptReturnDto) {
+ return R.ok(salesReceiptReturnService.pageSalesReceiptReturnDto(salesReceiptReturnDto));
+ }
+}
diff --git a/src/main/java/com/ruoyi/account/controller/SalesRefundAmountOrderController.java b/src/main/java/com/ruoyi/account/controller/SalesRefundAmountOrderController.java
new file mode 100644
index 0000000..daf35a4
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/controller/SalesRefundAmountOrderController.java
@@ -0,0 +1,42 @@
+package com.ruoyi.account.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.dto.SalesRefundAmountOrderDto;
+import com.ruoyi.account.pojo.SalesRefundAmountOrder;
+import com.ruoyi.account.service.SalesRefundAmountOrderService;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 閿�鍞鐞�--閫�娆惧崟 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-07 10:16:47
+ */
+@RestController
+@RequestMapping("/salesRefundAmountOrder")
+public class SalesRefundAmountOrderController {
+
+ @Autowired
+ private SalesRefundAmountOrderService salesRefundAmountOrderService;
+
+ @GetMapping("/page")
+ public R pageSalesRefundAmountOrderDto(Page<SalesRefundAmountOrderDto> page, SalesRefundAmountOrderDto salesRefundAmountOrder) {
+ return R.ok(salesRefundAmountOrderService.pageSalesRefundAmountOrderDto(page, salesRefundAmountOrder));
+ }
+
+ @ApiOperation("澶勭悊")
+ @PostMapping("/dispose")
+ public R dispose( SalesRefundAmountOrderDto salesRefundAmountOrderId) {
+ return R.ok(salesRefundAmountOrderService.dispose(salesRefundAmountOrderId));
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/account/dto/SalesReceiptReturnDto.java b/src/main/java/com/ruoyi/account/dto/SalesReceiptReturnDto.java
new file mode 100644
index 0000000..728d9a7
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/dto/SalesReceiptReturnDto.java
@@ -0,0 +1,8 @@
+package com.ruoyi.account.dto;
+
+import com.ruoyi.account.pojo.SalesReceiptReturn;
+import lombok.Data;
+
+@Data
+public class SalesReceiptReturnDto extends SalesReceiptReturn {
+}
diff --git a/src/main/java/com/ruoyi/account/dto/SalesRefundAmountOrderDto.java b/src/main/java/com/ruoyi/account/dto/SalesRefundAmountOrderDto.java
new file mode 100644
index 0000000..698e0e1
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/dto/SalesRefundAmountOrderDto.java
@@ -0,0 +1,25 @@
+package com.ruoyi.account.dto;
+
+import com.ruoyi.account.pojo.SalesRefundAmountOrder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SalesRefundAmountOrderDto extends SalesRefundAmountOrder {
+
+ @ApiModelProperty("閫�璐у崟鍙�")
+ private String returnManagementNo;
+
+ @ApiModelProperty("瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ @ApiModelProperty("閿�鍞崟鍙�")
+ private String salesContractNo;
+
+ @ApiModelProperty("鍒涘缓浜哄悕绉�")
+ private String createUserName;
+
+
+
+}
diff --git a/src/main/java/com/ruoyi/account/mapper/SalesReceiptReturnMapper.java b/src/main/java/com/ruoyi/account/mapper/SalesReceiptReturnMapper.java
new file mode 100644
index 0000000..51be16b
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/mapper/SalesReceiptReturnMapper.java
@@ -0,0 +1,18 @@
+package com.ruoyi.account.mapper;
+
+import com.ruoyi.account.pojo.SalesReceiptReturn;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 鏀舵閫�璐ц〃 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-09 03:34:18
+ */
+@Mapper
+public interface SalesReceiptReturnMapper extends BaseMapper<SalesReceiptReturn> {
+
+}
diff --git a/src/main/java/com/ruoyi/account/mapper/SalesRefundAmountOrderMapper.java b/src/main/java/com/ruoyi/account/mapper/SalesRefundAmountOrderMapper.java
new file mode 100644
index 0000000..adfae86
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/mapper/SalesRefundAmountOrderMapper.java
@@ -0,0 +1,23 @@
+package com.ruoyi.account.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.dto.SalesRefundAmountOrderDto;
+import com.ruoyi.account.pojo.SalesRefundAmountOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 閿�鍞鐞�--閫�娆惧崟 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-07 10:16:47
+ */
+@Mapper
+public interface SalesRefundAmountOrderMapper extends BaseMapper<SalesRefundAmountOrder> {
+
+ IPage<SalesRefundAmountOrderDto> pageSalesRefundAmountOrderDto(Page<SalesRefundAmountOrderDto> page,@Param("ew") SalesRefundAmountOrderDto salesRefundAmountOrder);
+}
diff --git a/src/main/java/com/ruoyi/account/pojo/SalesReceiptReturn.java b/src/main/java/com/ruoyi/account/pojo/SalesReceiptReturn.java
new file mode 100644
index 0000000..f05f9ed
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/pojo/SalesReceiptReturn.java
@@ -0,0 +1,71 @@
+package com.ruoyi.account.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.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 鏀舵閫�璐ц〃
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-09 03:34:18
+ */
+@Getter
+@Setter
+@TableName("sales_receipt_return")
+@ApiModel(value = "SalesReceiptReturn瀵硅薄", description = "鏀舵閫�璐ц〃")
+public class SalesReceiptReturn implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("涓婚敭 ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("閫�娆惧崟鍙�")
+ private String refundId;
+
+ @ApiModelProperty("浠樻璐﹀彿")
+ private String paymentAccount;
+
+ @ApiModelProperty("浠樻璐﹀彿鍚嶇О")
+ private String paymentAccountName;
+
+ @ApiModelProperty("浠樻鏂瑰紡")
+ private Byte paymentMethod;
+
+ @ApiModelProperty("瀹為檯浠樻閲戦")
+ private BigDecimal actualAmount;
+
+ @ApiModelProperty("鎵嬬画璐�")
+ private BigDecimal fee;
+
+ @ApiModelProperty("浜ゆ槗鍙�")
+ private String transactionNo;
+
+ @ApiModelProperty("浼樻儬閲戦")
+ private BigDecimal discountAmount;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("鍒涘缓鑰�")
+ @TableField(fill = FieldFill.INSERT)
+ private Long createUser;
+}
diff --git a/src/main/java/com/ruoyi/account/pojo/SalesRefundAmountOrder.java b/src/main/java/com/ruoyi/account/pojo/SalesRefundAmountOrder.java
new file mode 100644
index 0000000..08cb451
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/pojo/SalesRefundAmountOrder.java
@@ -0,0 +1,70 @@
+package com.ruoyi.account.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.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 閿�鍞鐞�--閫�娆惧崟
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-07 10:16:47
+ */
+@Getter
+@Setter
+@TableName("sales_refund_amount_order")
+@ApiModel(value = "SalesRefundAmountOrder瀵硅薄", description = "閿�鍞鐞�--閫�娆惧崟")
+public class SalesRefundAmountOrder implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("閫�璐у崟鍙穒d")
+ private Long returnManagementId;
+
+ @ApiModelProperty("鐘舵��")
+ private Integer status;
+
+ @ApiModelProperty("搴旈��娆鹃噾棰�")
+ private BigDecimal refundAmount;
+
+ @ApiModelProperty("宸查��娆鹃噾棰�")
+ private BigDecimal refundedAmount;
+
+ @ApiModelProperty("鏈��娆鹃噾棰�")
+ private BigDecimal notRefundedAmount;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("鍒涘缓浜篿d")
+ private Long createUserId;
+
+ @ApiModelProperty("鏇存柊浜篿d")
+ private Long updateUserId;
+}
diff --git a/src/main/java/com/ruoyi/account/service/SalesReceiptReturnService.java b/src/main/java/com/ruoyi/account/service/SalesReceiptReturnService.java
new file mode 100644
index 0000000..77c6aa9
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/SalesReceiptReturnService.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.account.dto.SalesReceiptReturnDto;
+import com.ruoyi.account.pojo.SalesReceiptReturn;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏀舵閫�璐ц〃 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-09 03:34:18
+ */
+public interface SalesReceiptReturnService extends IService<SalesReceiptReturn> {
+
+ IPage<SalesReceiptReturnDto> pageSalesReceiptReturnDto(SalesReceiptReturnDto salesReceiptReturnDto);
+
+}
diff --git a/src/main/java/com/ruoyi/account/service/SalesRefundAmountOrderService.java b/src/main/java/com/ruoyi/account/service/SalesRefundAmountOrderService.java
new file mode 100644
index 0000000..bf45755
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/SalesRefundAmountOrderService.java
@@ -0,0 +1,26 @@
+package com.ruoyi.account.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.dto.SalesRefundAmountOrderDto;
+import com.ruoyi.account.pojo.SalesRefundAmountOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 閿�鍞鐞�--閫�娆惧崟 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-07 10:16:47
+ */
+public interface SalesRefundAmountOrderService extends IService<SalesRefundAmountOrder> {
+
+ IPage<SalesRefundAmountOrderDto> pageSalesRefundAmountOrderDto(Page<SalesRefundAmountOrderDto> page, SalesRefundAmountOrderDto salesRefundAmountOrder);
+
+ Boolean addSalesRefundAmountOrderDto(SalesRefundAmountOrderDto salesRefundAmountOrder);
+
+
+ Boolean dispose(SalesRefundAmountOrderDto salesRefundAmountOrder);
+
+}
diff --git a/src/main/java/com/ruoyi/account/service/impl/SalesReceiptReturnServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/SalesReceiptReturnServiceImpl.java
new file mode 100644
index 0000000..3aa201e
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/impl/SalesReceiptReturnServiceImpl.java
@@ -0,0 +1,27 @@
+package com.ruoyi.account.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.account.dto.SalesReceiptReturnDto;
+import com.ruoyi.account.pojo.SalesReceiptReturn;
+import com.ruoyi.account.mapper.SalesReceiptReturnMapper;
+import com.ruoyi.account.service.SalesReceiptReturnService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏀舵閫�璐ц〃 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-09 03:34:18
+ */
+@Service
+public class SalesReceiptReturnServiceImpl extends ServiceImpl<SalesReceiptReturnMapper, SalesReceiptReturn> implements SalesReceiptReturnService {
+
+ @Override
+ public IPage<SalesReceiptReturnDto> pageSalesReceiptReturnDto(SalesReceiptReturnDto salesReceiptReturnDto) {
+
+ return null;
+ }
+}
diff --git a/src/main/java/com/ruoyi/account/service/impl/SalesRefundAmountOrderServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/SalesRefundAmountOrderServiceImpl.java
new file mode 100644
index 0000000..c04fdb5
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/impl/SalesRefundAmountOrderServiceImpl.java
@@ -0,0 +1,43 @@
+package com.ruoyi.account.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.dto.SalesRefundAmountOrderDto;
+import com.ruoyi.account.pojo.SalesRefundAmountOrder;
+import com.ruoyi.account.mapper.SalesRefundAmountOrderMapper;
+import com.ruoyi.account.service.SalesRefundAmountOrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 閿�鍞鐞�--閫�娆惧崟 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-07 10:16:47
+ */
+@Service
+public class SalesRefundAmountOrderServiceImpl extends ServiceImpl<SalesRefundAmountOrderMapper, SalesRefundAmountOrder> implements SalesRefundAmountOrderService {
+
+
+ @Autowired
+ private SalesRefundAmountOrderMapper salesRefundAmountOrderMapper;
+
+ @Override
+ public IPage<SalesRefundAmountOrderDto> pageSalesRefundAmountOrderDto(Page<SalesRefundAmountOrderDto> page, SalesRefundAmountOrderDto salesRefundAmountOrder) {
+ return salesRefundAmountOrderMapper.pageSalesRefundAmountOrderDto(page, salesRefundAmountOrder);
+ }
+
+ @Override
+ public Boolean addSalesRefundAmountOrderDto(SalesRefundAmountOrderDto salesRefundAmountOrder) {
+ return this.save(salesRefundAmountOrder);
+ }
+
+ @Override
+ public Boolean dispose(SalesRefundAmountOrderDto salesRefundAmountOrder) {
+
+ return null;
+ }
+}
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ReturnSaleProductDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ReturnSaleProductDto.java
index fa6e6d6..51cb040 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ReturnSaleProductDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ReturnSaleProductDto.java
@@ -18,4 +18,10 @@
private BigDecimal unQuantity;
private BigDecimal totalReturnNum;
+
+ // 閫�璐ф�讳环
+ private BigDecimal price;
+
+ // 閫�璐ф�讳环
+ private BigDecimal taxInclusiveUnitPrice;
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/mapper/ReturnSaleProductMapper.java b/src/main/java/com/ruoyi/procurementrecord/mapper/ReturnSaleProductMapper.java
index 776a3b2..879a074 100644
--- a/src/main/java/com/ruoyi/procurementrecord/mapper/ReturnSaleProductMapper.java
+++ b/src/main/java/com/ruoyi/procurementrecord/mapper/ReturnSaleProductMapper.java
@@ -20,4 +20,6 @@
public interface ReturnSaleProductMapper extends BaseMapper<ReturnSaleProduct> {
List<ReturnSaleProductDto> listReturnSaleProductDto(@Param("returnManagementId") Long returnManagementId);
+
+ List<ReturnSaleProductDto> listReturnSaleProduct(@Param("returnManagementId") Long returnManagementId);
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/ReturnSaleProductService.java b/src/main/java/com/ruoyi/procurementrecord/service/ReturnSaleProductService.java
index 64e6e16..07c080f 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/ReturnSaleProductService.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/ReturnSaleProductService.java
@@ -17,4 +17,6 @@
public interface ReturnSaleProductService extends IService<ReturnSaleProduct> {
List<ReturnSaleProductDto> listReturnSaleProductDto(Long returnManagementId);
+
+ List<ReturnSaleProductDto> listReturnSaleProduct(Long returnManagementId);
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
index 9af5101..6eb90db 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
@@ -1,10 +1,16 @@
package com.ruoyi.procurementrecord.service.impl;
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.dto.SalesRefundAmountOrderDto;
+import com.ruoyi.account.pojo.SalesRefundAmountOrder;
+import com.ruoyi.account.service.SalesRefundAmountOrderService;
import com.ruoyi.common.utils.OrderUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.procurementrecord.dto.ReturnManagementDto;
+import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
import com.ruoyi.procurementrecord.mapper.ReturnManagementMapper;
import com.ruoyi.procurementrecord.pojo.ReturnManagement;
import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
@@ -22,6 +28,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -42,6 +49,8 @@
private ShippingInfoService shippingInfoService;
@Autowired
private SalesLedgerMapper salesLedgerMapper;
+ @Autowired
+ private SalesRefundAmountOrderService salesRefundAmountOrderService;
@Override
public IPage<ReturnManagementDto> listPage(Page page, ReturnManagementDto returnManagement) {
@@ -91,8 +100,22 @@
@Override
public boolean handle(Long returnManagementId) {
ReturnManagement byId = this.getById(returnManagementId);
+ List<ReturnSaleProductDto> list = returnSaleProductService.listReturnSaleProduct(returnManagementId);
byId.setStatus(1);
updateById(byId);
+ SalesRefundAmountOrderDto salesRefundAmountOrder = new SalesRefundAmountOrderDto();
+ salesRefundAmountOrder.setReturnManagementId(returnManagementId);
+ salesRefundAmountOrder.setStatus(0);
+ salesRefundAmountOrder.setCreateTime(byId.getCreateTime());
+ salesRefundAmountOrder.setCreateUserId(SecurityUtils.getUserId());
+ BigDecimal bigDecimal = new BigDecimal(0);
+ for (ReturnSaleProductDto returnSaleProduct : list) {
+ bigDecimal = bigDecimal.add(returnSaleProduct.getPrice());
+ salesRefundAmountOrder.setRefundedAmount(new BigDecimal(0));
+ }
+ salesRefundAmountOrder.setRefundAmount(bigDecimal);
+ salesRefundAmountOrder.setNotRefundedAmount(salesRefundAmountOrder.getRefundedAmount());
+ salesRefundAmountOrderService.addSalesRefundAmountOrderDto(salesRefundAmountOrder);
return true;
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnSaleProductServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnSaleProductServiceImpl.java
index 2e43729..a4281d0 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnSaleProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnSaleProductServiceImpl.java
@@ -29,4 +29,9 @@
return returnSaleProductMapper.listReturnSaleProductDto(returnManagementId);
}
+
+ @Override
+ public List<ReturnSaleProductDto> listReturnSaleProduct(Long returnManagementId) {
+ return returnSaleProductMapper.listReturnSaleProduct(returnManagementId);
+ }
}
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrderProductsController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrderProductsController.java
new file mode 100644
index 0000000..30fbb84
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrderProductsController.java
@@ -0,0 +1,18 @@
+package com.ruoyi.purchase.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-09 01:37:44
+ */
+@RestController
+@RequestMapping("/purchaseReturnOrderProducts")
+public class PurchaseReturnOrderProductsController {
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
index df60a34..67273d1 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
@@ -42,6 +42,6 @@
if (purchaseReturnOrderDto.getIsDefaultNo()) {
purchaseReturnOrderDto.setNo(OrderUtils.countTodayByCreateTime(purchaseReturnOrdersMapper, "CGTL"));
}
- return AjaxResult.success(purchaseReturnOrdersService.save(purchaseReturnOrderDto));
+ return AjaxResult.success(purchaseReturnOrdersService.add(purchaseReturnOrderDto));
}
}
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java
index 2de8642..f10a853 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java
@@ -1,10 +1,16 @@
package com.ruoyi.purchase.dto;
+import com.ruoyi.purchase.pojo.PurchaseReturnOrderProducts;
import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
import lombok.Data;
+
+import java.util.List;
@Data
public class PurchaseReturnOrderDto extends PurchaseReturnOrders {
// 鏄惁浣跨敤绯荤粺鍗曞彿
private Boolean isDefaultNo;
+
+
+ private List<PurchaseReturnOrderProductsDto> purchaseReturnOrderProductsDtos;
}
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderProductsDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderProductsDto.java
new file mode 100644
index 0000000..c89c151
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderProductsDto.java
@@ -0,0 +1,13 @@
+package com.ruoyi.purchase.dto;
+
+import com.ruoyi.purchase.pojo.PurchaseReturnOrderProducts;
+import lombok.Data;
+
+@Data
+public class PurchaseReturnOrderProductsDto extends PurchaseReturnOrderProducts {
+
+ private String productName;
+ private String model;
+ private String unit;
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrderProductsMapper.java b/src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrderProductsMapper.java
new file mode 100644
index 0000000..d6580d4
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrderProductsMapper.java
@@ -0,0 +1,18 @@
+package com.ruoyi.purchase.mapper;
+
+import com.ruoyi.purchase.pojo.PurchaseReturnOrderProducts;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-09 01:37:44
+ */
+@Mapper
+public interface PurchaseReturnOrderProductsMapper extends BaseMapper<PurchaseReturnOrderProducts> {
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java
new file mode 100644
index 0000000..69e141f
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java
@@ -0,0 +1,51 @@
+package com.ruoyi.purchase.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.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-09 01:37:44
+ */
+@Getter
+@Setter
+@TableName("purchase_return_order_products")
+@ApiModel(value = "PurchaseReturnOrderProducts瀵硅薄", description = "")
+public class PurchaseReturnOrderProducts implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("閫�璐у崟id")
+ private Long purchaseReturnOrderId;
+
+ @ApiModelProperty("閲囪喘浜у搧id")
+ private Long salesLedgerProductId;
+
+ @ApiModelProperty("褰曞叆鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("閫�璐ф暟閲�")
+ private BigDecimal num;
+}
diff --git a/src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrderProductsService.java b/src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrderProductsService.java
new file mode 100644
index 0000000..0997d13
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrderProductsService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.purchase.service;
+
+import com.ruoyi.purchase.pojo.PurchaseReturnOrderProducts;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-09 01:37:44
+ */
+public interface PurchaseReturnOrderProductsService extends IService<PurchaseReturnOrderProducts> {
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrdersService.java b/src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrdersService.java
index 74a451f..6ec7650 100644
--- a/src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrdersService.java
+++ b/src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrdersService.java
@@ -17,4 +17,6 @@
*/
public interface PurchaseReturnOrdersService extends IService<PurchaseReturnOrders> {
IPage<PurchaseReturnOrderVo> listPage(Page page, PurchaseReturnOrderDto purchaseReturnOrderDto);
+
+ Boolean add(PurchaseReturnOrderDto purchaseReturnOrderDto);
}
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrderProductsServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrderProductsServiceImpl.java
new file mode 100644
index 0000000..a6da982
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrderProductsServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.purchase.service.impl;
+
+import com.ruoyi.purchase.pojo.PurchaseReturnOrderProducts;
+import com.ruoyi.purchase.mapper.PurchaseReturnOrderProductsMapper;
+import com.ruoyi.purchase.service.PurchaseReturnOrderProductsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-09 01:37:44
+ */
+@Service
+public class PurchaseReturnOrderProductsServiceImpl extends ServiceImpl<PurchaseReturnOrderProductsMapper, PurchaseReturnOrderProducts> implements PurchaseReturnOrderProductsService {
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
index c084a68..d0ab7ea 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.purchase.dto.PurchaseReturnOrderDto;
+import com.ruoyi.purchase.dto.PurchaseReturnOrderProductsDto;
+import com.ruoyi.purchase.mapper.PurchaseReturnOrderProductsMapper;
import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
import com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper;
import com.ruoyi.purchase.service.PurchaseReturnOrdersService;
@@ -10,6 +12,7 @@
import com.ruoyi.purchase.vo.PurchaseReturnOrderVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* <p>
@@ -23,9 +26,24 @@
public class PurchaseReturnOrdersServiceImpl extends ServiceImpl<PurchaseReturnOrdersMapper, PurchaseReturnOrders> implements PurchaseReturnOrdersService {
@Autowired
private PurchaseReturnOrdersMapper purchaseReturnOrdersMapper;
+ @Autowired
+ private PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;
@Override
public IPage<PurchaseReturnOrderVo> listPage(Page page, PurchaseReturnOrderDto purchaseReturnOrderDto) {
return purchaseReturnOrdersMapper.listPage(page, purchaseReturnOrderDto);
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean add(PurchaseReturnOrderDto purchaseReturnOrderDto) {
+ this.save(purchaseReturnOrderDto);
+ if (purchaseReturnOrderDto.getPurchaseReturnOrderProductsDtos().isEmpty()) {
+ for (PurchaseReturnOrderProductsDto purchaseReturnOrderProductsDto :purchaseReturnOrderDto.getPurchaseReturnOrderProductsDtos()) {
+ purchaseReturnOrderProductsDto.setPurchaseReturnOrderId(purchaseReturnOrderDto.getId());
+ purchaseReturnOrderProductsMapper.insert(purchaseReturnOrderProductsDto);
+ }
+ }
+ return true;
+ }
}
diff --git a/src/main/resources/mapper/account/SalesReceiptReturnMapper.xml b/src/main/resources/mapper/account/SalesReceiptReturnMapper.xml
new file mode 100644
index 0000000..5528300
--- /dev/null
+++ b/src/main/resources/mapper/account/SalesReceiptReturnMapper.xml
@@ -0,0 +1,21 @@
+<?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.account.mapper.SalesReceiptReturnMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.pojo.SalesReceiptReturn">
+ <id column="id" property="id" />
+ <result column="refund_id" property="refundId" />
+ <result column="payment_account" property="paymentAccount" />
+ <result column="payment_account_name" property="paymentAccountName" />
+ <result column="payment_method" property="paymentMethod" />
+ <result column="actual_amount" property="actualAmount" />
+ <result column="fee" property="fee" />
+ <result column="transaction_no" property="transactionNo" />
+ <result column="discount_amount" property="discountAmount" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="create_user" property="createUser" />
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml b/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml
new file mode 100644
index 0000000..a58e90f
--- /dev/null
+++ b/src/main/resources/mapper/account/SalesRefundAmountOrderMapper.xml
@@ -0,0 +1,42 @@
+<?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.account.mapper.SalesRefundAmountOrderMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.pojo.SalesRefundAmountOrder">
+ <id column="id" property="id" />
+ <result column="return_management_id" property="returnManagementId" />
+ <result column="status" property="status" />
+ <result column="refund_amount" property="refundAmount" />
+ <result column="refunded_amount" property="refundedAmount" />
+ <result column="not_refunded_amount" property="notRefundedAmount" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="create_user_id" property="createUserId" />
+ <result column="update_user_id" property="updateUserId" />
+ </resultMap>
+ <select id="pageSalesRefundAmountOrderDto" resultType="com.ruoyi.account.dto.SalesRefundAmountOrderDto">
+ select sl.sales_contract_no,
+ sl.customer_contract_no,
+ slp.specification_model,
+ slp.product_category as product_name,
+ slp.unit,
+ sl.customer_name,
+ rm.return_no as return_management_no,
+ srao.*
+ from sales_refund_amount_order srao
+ left join return_management rm on srao.return_management_id = rm.id
+ left join return_sale_product rs on rm.id = rs.return_management_id
+ left join sales_ledger_product slp on rs.return_sale_ledger_product_id = slp.id
+ left join sales_ledger sl on slp.sales_ledger_id = sl.id
+ <where>
+ <if test="ew.salesContractNo != null and ew.salesContractNo !=''">
+ and sl.sales_contract_no like concat('%',#{ew.salesContractNo},'%')
+ </if>
+ <if test="ew.returnManagementNo != null and ew.returnManagementNo !=''">
+ and rm.return_no like concat('%',#{ew.returnManagementNo},'%')
+ </if>
+ </where>
+ </select>
+
+</mapper>
diff --git a/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml b/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml
index 87257ab..0524673 100644
--- a/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml
@@ -28,5 +28,11 @@
GROUP BY return_sale_ledger_product_id) rs ON rs.return_sale_ledger_product_id = slp.id
where rm.id =#{returnManagementId}
</select>
+ <select id="listReturnSaleProduct" resultType="com.ruoyi.procurementrecord.dto.ReturnSaleProductDto">
+ select rsp.*,slp.tax_inclusive_unit_price ,slp.tax_inclusive_total_price*rsp.num as price
+ from return_sale_product rsp
+ left join sales_ledger_product slp on slp.id = rsp.return_sale_ledger_product_id
+ where rsp.return_management_id = #{returnManagementId}
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrderProductsMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrderProductsMapper.xml
new file mode 100644
index 0000000..e77fdf0
--- /dev/null
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrderProductsMapper.xml
@@ -0,0 +1,15 @@
+<?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.purchase.mapper.PurchaseReturnOrderProductsMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.purchase.pojo.PurchaseReturnOrderProducts">
+ <id column="id" property="id" />
+ <result column="purchase_return_order_id" property="purchaseReturnOrderId" />
+ <result column="sales_ledger_product_id" property="salesLedgerProductId" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="num" property="num" />
+ </resultMap>
+
+</mapper>
--
Gitblit v1.9.3