采购付款 付款记录添加退款 清空改为清付款和退款

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

@@ -51,4 +51,9 @@ public class PurchasePayRecordDetailVo extends PurchasePayRecordDetail {
      */
     private BigDecimal paidAmount;
 
+    /**
+     * 数据类型  1付款记录 2退款记录
+     */
+    private Integer type;
+
 }

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

@@ -10,10 +10,12 @@ import com.fjhx.common.utils.Assert;
 import com.fjhx.purchase.entity.purchase.dto.PurchasePayRecordDetailSelectDto;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.purchase.po.PurchasePayRecordDetail;
+import com.fjhx.purchase.entity.purchase.po.PurchaseRefundRecord;
 import com.fjhx.purchase.entity.purchase.vo.PurchasePayRecordDetailVo;
 import com.fjhx.purchase.mapper.purchase.PurchasePayRecordDetailMapper;
 import com.fjhx.purchase.service.purchase.PurchasePayRecordDetailService;
 import com.fjhx.purchase.service.purchase.PurchasePayRecordService;
+import com.fjhx.purchase.service.purchase.PurchaseRefundRecordService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.utils.UserUtil;
@@ -41,12 +43,14 @@ public class PurchasePayRecordDetailServiceImpl extends ServiceImpl<PurchasePayR
     private PurchaseService purchaseService;
     @Autowired
     private PurchasePayRecordService purchasePayRecordService;
+    @Autowired
+    private PurchaseRefundRecordService purchaseRefundRecordService;
 
     @Override
     public Page<PurchasePayRecordDetailVo> getPage(PurchasePayRecordDetailSelectDto dto) {
         IWrapper<PurchasePayRecordDetail> wrapper = getWrapper();
-        wrapper.eq(PurchasePayRecordDetail::getPurchaseId, dto.getPurchaseId());
-        wrapper.orderByDesc("pprd", PurchasePayRecordDetail::getId);
+        wrapper.eq("t1",PurchasePayRecordDetail::getPurchaseId, dto.getPurchaseId());
+        wrapper.orderByDesc("t1", PurchasePayRecordDetail::getId);
         Page<PurchasePayRecordDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         UserUtil.assignmentNickName(page.getRecords(), PurchasePayRecordDetailVo::getCreateUser, PurchasePayRecordDetailVo::setPayUserName);
         return page;
@@ -73,6 +77,9 @@ public class PurchasePayRecordDetailServiceImpl extends ServiceImpl<PurchasePayR
         }
         //清空付款明细信息
         this.remove(q -> q.eq(PurchasePayRecordDetail::getPurchaseId, dto.getPurchaseId()));
+
+        //清空退款记录
+        purchaseRefundRecordService.remove(q -> q.eq(PurchaseRefundRecord::getPurchaseId, dto.getPurchaseId()));
     }
 
     @Override

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

@@ -2,19 +2,42 @@
 <!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.PurchasePayRecordDetailMapper">
     <sql id="pageOrList">
-        SELECT pprd.id,
-               pprd.purchase_id,
-               pprd.amount,
-               pprd.pay_date,
-               pprd.create_user,
-               pprd.create_time,
-               pprd.update_user,
-               pprd.update_time,
-               ppr.pay_account,
-               pprd.remark,
-               ppr.id purchasePayRecordId
-        FROM purchase_pay_record_detail pprd
-                 LEFT JOIN purchase_pay_record ppr ON pprd.purchase_pay_record_id = ppr.id
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    pprd.id,
+                    pprd.purchase_id,
+                    pprd.amount,
+                    pprd.pay_date,
+                    pprd.create_user,
+                    pprd.create_time,
+                    pprd.update_user,
+                    pprd.update_time,
+                    ppr.pay_account,
+                    pprd.remark,
+                    ppr.id purchasePayRecordId,
+                    1 AS type
+                FROM
+                    purchase_pay_record_detail pprd
+                        LEFT JOIN purchase_pay_record ppr ON pprd.purchase_pay_record_id = ppr.id UNION ALL
+                SELECT
+                    prr.id,
+                    prr.purchase_id,
+                    prr.amount,
+                    prr.refund_date AS payDate,
+                    prr.create_user,
+                    prr.create_time,
+                    prr.update_user,
+                    prr.update_time,
+                    prr.refund_account AS payAccount,
+                    prr.remark,
+                    NULL purchasePayRecordId,
+                    2 AS type
+                FROM
+                    purchase_refund_record prr
+            ) t1
             ${ew.customSqlSegment}
     </sql>
     <select id="getPage" resultType="com.fjhx.purchase.entity.purchase.vo.PurchasePayRecordDetailVo">