采购退款

code/src/test/java/purchaseDataSource.java

@@ -4,9 +4,9 @@ public class purchaseDataSource {
 
     public static void main(String[] args) {
         GeneratorApplication.builder()
-                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
-                .username("fjhx2012mysql")
-                .password("3PN-Mzn#vnP&q6d")
+                .url("jdbc:mysql://36.134.91.96:12333/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("root")
+                .password("Fjhx@pwd123")
                 .port(9989)
                 .module("hx-purchase")
                 .parent("com.fjhx.purchase")

hx-purchase/src/main/java/com/fjhx/purchase/controller/purchase/PurchaseRefundRecordController.java

@@ -0,0 +1,35 @@
+package com.fjhx.purchase.controller.purchase;
+
+import com.fjhx.purchase.entity.purchase.dto.PurchaseRefundRecordDto;
+import com.fjhx.purchase.service.purchase.PurchaseRefundRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 采购退款记录 维多利亚 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-06-28
+ */
+@RestController
+@RequestMapping("/purchaseRefundRecord")
+public class PurchaseRefundRecordController {
+
+    @Autowired
+    private PurchaseRefundRecordService purchaseRefundRecordService;
+
+    /**
+     * 采购退款记录 维多利亚新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody PurchaseRefundRecordDto purchaseRefundRecordDto) {
+        purchaseRefundRecordService.add(purchaseRefundRecordDto);
+    }
+
+}

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/dto/PurchaseRefundRecordDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.purchase.entity.purchase.dto;
+
+import com.fjhx.purchase.entity.purchase.po.PurchaseRefundRecord;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 采购退款记录 维多利亚新增编辑入参实体
+ *
+ * @author
+ * @since 2023-06-28
+ */
+@Getter
+@Setter
+public class PurchaseRefundRecordDto extends PurchaseRefundRecord {
+
+}

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/dto/PurchaseRefundRecordSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.purchase.entity.purchase.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 采购退款记录 维多利亚列表查询入参实体
+ *
+ * @author
+ * @since 2023-06-28
+ */
+@Getter
+@Setter
+public class PurchaseRefundRecordSelectDto extends BaseSelectDto {
+
+}

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/po/PurchasePayRecord.java

@@ -36,4 +36,9 @@ public class PurchasePayRecord extends BasePo {
      */
     private String payAccount;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
 }

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/po/PurchasePayRecordDetail.java

@@ -1,21 +1,20 @@
 package com.fjhx.purchase.entity.purchase.po;
 
-import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.math.BigDecimal;
-import java.util.Date;
+import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>
  * 采购付款记录
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-05-23
  */
 @Getter
@@ -45,4 +44,9 @@ public class PurchasePayRecordDetail extends BasePo {
      */
     private Long purchasePayRecordId;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
 }

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/po/PurchaseRefundRecord.java

@@ -0,0 +1,44 @@
+package com.fjhx.purchase.entity.purchase.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 采购退款记录 维多利亚
+ * </p>
+ *
+ * @author
+ * @since 2023-06-28
+ */
+@Getter
+@Setter
+@TableName("purchase_refund_record")
+public class PurchaseRefundRecord extends BasePo {
+
+    /**
+     * 采购id
+     */
+    private Long purchaseId;
+
+    /**
+     * 退款时间
+     */
+    private Date refundDate;
+
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/vo/PurchaseRefundRecordVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.purchase.entity.purchase.vo;
+
+import com.fjhx.purchase.entity.purchase.po.PurchaseRefundRecord;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 采购退款记录 维多利亚列表查询返回值实体
+ *
+ * @author
+ * @since 2023-06-28
+ */
+@Getter
+@Setter
+public class PurchaseRefundRecordVo extends PurchaseRefundRecord {
+
+}

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/vo/PurchaseVo.java

@@ -38,4 +38,9 @@ public class PurchaseVo extends Purchase {
      * 已付款金额
      */
     private BigDecimal paidAmount;
+
+    /**
+     * 退款金额
+     */
+    private BigDecimal refundAmount;
 }

hx-purchase/src/main/java/com/fjhx/purchase/mapper/purchase/PurchaseRefundRecordMapper.java

@@ -0,0 +1,17 @@
+package com.fjhx.purchase.mapper.purchase;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.purchase.entity.purchase.po.PurchaseRefundRecord;
+
+
+/**
+ * <p>
+ * 采购退款记录 维多利亚 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-06-28
+ */
+public interface PurchaseRefundRecordMapper extends BaseMapper<PurchaseRefundRecord> {
+
+}

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/PurchaseRefundRecordService.java

@@ -0,0 +1,23 @@
+package com.fjhx.purchase.service.purchase;
+
+import com.fjhx.purchase.entity.purchase.dto.PurchaseRefundRecordDto;
+import com.fjhx.purchase.entity.purchase.po.PurchaseRefundRecord;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 采购退款记录 维多利亚 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-06-28
+ */
+public interface PurchaseRefundRecordService extends BaseService<PurchaseRefundRecord> {
+
+    /**
+     * 采购退款记录 维多利亚新增
+     */
+    void add(PurchaseRefundRecordDto purchaseRefundRecordDto);
+
+}

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseRefundRecordServiceImpl.java

@@ -0,0 +1,27 @@
+package com.fjhx.purchase.service.purchase.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.purchase.entity.purchase.dto.PurchaseRefundRecordDto;
+import com.fjhx.purchase.entity.purchase.po.PurchaseRefundRecord;
+import com.fjhx.purchase.mapper.purchase.PurchaseRefundRecordMapper;
+import com.fjhx.purchase.service.purchase.PurchaseRefundRecordService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 采购退款记录 维多利亚 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-06-28
+ */
+@Service
+public class PurchaseRefundRecordServiceImpl extends ServiceImpl<PurchaseRefundRecordMapper, PurchaseRefundRecord> implements PurchaseRefundRecordService {
+
+    @Override
+    public void add(PurchaseRefundRecordDto purchaseRefundRecordDto) {
+        this.save(purchaseRefundRecordDto);
+    }
+
+}

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseServiceImpl.java

@@ -28,6 +28,7 @@ import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
 import com.fjhx.purchase.entity.purchase.po.PurchasePayRecordDetail;
+import com.fjhx.purchase.entity.purchase.po.PurchaseRefundRecord;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseDocumentaryVo;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseVo;
 import com.fjhx.purchase.entity.subscribe.po.Subscribe;
@@ -39,6 +40,7 @@ import com.fjhx.purchase.service.invoice.InvoiceDetailsService;
 import com.fjhx.purchase.service.pay.PayDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
 import com.fjhx.purchase.service.purchase.PurchasePayRecordDetailService;
+import com.fjhx.purchase.service.purchase.PurchaseRefundRecordService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
 import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
 import com.fjhx.purchase.service.subscribe.SubscribeService;
@@ -118,6 +120,8 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
 
     @Autowired
     private StockService stockService;
+    @Autowired
+    private PurchaseRefundRecordService purchaseRefundRecordService;
 
     /**
      * 列表
@@ -282,6 +286,19 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
             BigDecimal paidAmount = purchasePayRecords.stream().map(PurchasePayRecordDetail::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
             purchaseVo.setPaidAmount(paidAmount);
         }
+        //赋值退款金额
+        Map<Long, List<PurchaseRefundRecord>> refundRecordMap = purchaseRefundRecordService.mapKGroup(PurchaseRefundRecord::getPurchaseId,
+                q -> q.in(PurchaseRefundRecord::getPurchaseId, purchaseIds));
+        for (PurchaseVo purchaseVo : list) {
+            List<PurchaseRefundRecord> purchaseRefundRecords = refundRecordMap.get(purchaseVo.getId());
+            if (ObjectUtils.isEmpty(purchaseRefundRecords)) {
+                purchaseVo.setRefundAmount(BigDecimal.ZERO);
+                continue;
+            }
+            //求和已退款
+            BigDecimal refundAmount = purchaseRefundRecords.stream().map(PurchaseRefundRecord::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+            purchaseVo.setRefundAmount(refundAmount);
+        }
 
         return page;
     }

hx-purchase/src/main/resources/mapper/purchase/PurchasePayRecordDetailMapper.xml

@@ -10,7 +10,8 @@
                pprd.create_time,
                pprd.update_user,
                pprd.update_time,
-               ppr.pay_account
+               ppr.pay_account,
+               pprd.remark
         FROM purchase_pay_record_detail pprd
                  LEFT JOIN purchase_pay_record ppr ON pprd.purchase_pay_record_id = ppr.id
             ${ew.customSqlSegment}

hx-purchase/src/main/resources/mapper/purchase/PurchaseRefundRecordMapper.xml

@@ -0,0 +1,4 @@
+<?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.fjhx.purchase.mapper.purchase.PurchaseRefundRecordMapper">
+</mapper>