退款重构

chenjiahe

2023-03-24 bdc2690c86edc484375fcdbd3330b583886776b7

退款重构

 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java

@@ -1,5 +1,6 @@
package com.hz.his.dto.order;

import com.hz.his.dto.order.refund.RefundPaymentMethodVo;
import lombok.Data;

import java.math.BigDecimal;
@@ -30,4 +31,7 @@
    /** 退款二级子订单信息集合 */
    private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos;

    /**分配的退款方式金额-内部传参使用，接口暂时无用*/
    private List<RefundPaymentMethodVo> distributionPayList;

}

 phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java

@@ -1,8 +1,10 @@
package com.hz.his.dto.order;

import com.hz.his.dto.order.refund.RefundPaymentMethodVo;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * @Author
@@ -25,4 +27,7 @@
    private String remarks;
    /** 退款原因（用户） */
    private String refundReason;

    /**分配的退款方式金额-内部传参使用，接口暂时无用*/
    private List<RefundPaymentMethodVo> distributionPayList;
}

 phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java

@@ -31,8 +31,12 @@
    public OrderPayMethodDto() {
    }

    public OrderPayMethodDto(String payMethodNo, BigDecimal money) {
    public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal, String refundNumberNo, String refundNumberName, BigDecimal money) {
        this.payMethodNo = payMethodNo;
        this.payMethodName = payMethodName;
        this.payTotal = payTotal;
        this.refundNumberNo = refundNumberNo;
        this.refundNumberName = refundNumberName;
        this.money = money;
    }
}

 phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java

@@ -24,8 +24,10 @@
    private String orderId;
    /** 退款类型(0:退次数退款,1:仅退款 默认:0) */
    private Integer refundType;
    /** 操作人id */
    /** 操作人员工标识*/
    private String operatorId;
    /** 操作人员工角色标识*/
    private String operatorRoleId;

    //总订单领建标识
    private String hisOrderId;

 phis-feign/src/main/java/com/hz/his/dto/order/refund/RefundPaymentMethodVo.java

New file
@@ -0,0 +1,33 @@
package com.hz.his.dto.order.refund;

import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.annotation.Index;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @author CJH
 * @Date 2023-03-24
 * 用来装载子项退款方式的金额
 */
@Data
public class RefundPaymentMethodVo {

    /**退款支付方式编号*/
    private String numberNo;
    /**退款支付方式名称*/
    private String name;
    /**退款金额*/
    private BigDecimal refundTotal;

    public RefundPaymentMethodVo() {
    }

    public RefundPaymentMethodVo(String numberNo, String name,BigDecimal refundTotal) {
        this.numberNo = numberNo;
        this.name = name;
        this.refundTotal = refundTotal;
    }
}