Merge branch 'master-fwq-积分抵扣现金' into master-prod-new

fwq

2024-05-01 623afb6fbb8ce6adebf237e7b670d9f4f339184d

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
package com.hz.his.dto.order;
 
import lombok.Data;
 
import java.math.BigDecimal;
 
/**
 * @author wzh
 * 退回支付记录扩展
 */
@Data
public class OrderPayMethodDto {
 
    /** 可退支付方式编码 */
    private String payMethodNo;
    /** 可退支付方式名称 */
    private String payMethodName;
    /** 可退支付金额 */
    private BigDecimal payTotal;
    /**是否现金支付 0否1是*/
    private Integer isMoneyPay;
    /**是否划扣计算：0否1是*/
    private Integer isExecute;
 
    /** 抵扣类型 */
    private String deductionType;
    /** 抵扣退款总值(积分) */
    private BigDecimal refundDeductionTotal;
 
    /** 转换方式编码 （实际退款方式编码） */
    private String refundNumberNo;
    /** 转换方式名称 （实际退款方式编码）*/
    private String refundNumberName;
    /** 转换实退金额 （实际退款金额）*/
    private BigDecimal money;
    /** 转换实退抵扣值 （实际退款积分）*/
    private BigDecimal deductionTotal;
 
    /** 备注 */
    private String remarks;
 
 
    public OrderPayMethodDto() {
    }
 
//    public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal,Integer isMoneyPay,Integer isExecute) {
//        this.payMethodNo = payMethodNo;
//        this.payMethodName = payMethodName;
//        this.payTotal = payTotal;
//        this.isMoneyPay = isMoneyPay;
//        this.isExecute = isExecute;
//    }
 
    public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal
            , Integer isMoneyPay, Integer isExecute, String deductionType, BigDecimal refundDeductionTotal) {
        this.payMethodNo = payMethodNo;
        this.payMethodName = payMethodName;
        this.payTotal = payTotal;
        this.isMoneyPay = isMoneyPay;
        this.isExecute = isExecute;
        this.deductionType = deductionType;
        this.refundDeductionTotal = refundDeductionTotal;
    }
}