Merge remote-tracking branch 'origin/master-test' into master-test

wangrenhuang

2022-11-23 bba4dceccfb4d1c38b41ca3e7f9e6bc98f34d85f

Merge remote-tracking branch 'origin/master-test' into master-test

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

@@ -3,6 +3,7 @@
import lombok.Data;

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

/**
 * @author wzh
@@ -13,6 +14,10 @@

    /** 子订单id */
    private String orderItemId;
    /** 子订单类型 */
    private String type;
    /** 商品名称 */
    private String goodsName;
    /** 实退数 */
    private Integer refundNum;
    /** 实退金额 */
@@ -20,4 +25,7 @@
    /** 实退原因 */
    private String refundReason;

    /** 退款二级子订单信息集合 */
    private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos;

}

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

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

import lombok.Data;

import java.math.BigDecimal;

/**
 * @Author
 * 订单结账扩展 二级子订单
 */
@Data
public class OrderItemSourceRefundDto {

    /** 子订单id */
    private String orderItemSonId;
    /** 子订单类型 */
    private String type;
    /** 商品名称 */
    private String goodsName;
    /** 实退数 */
    private Integer refundNum;
    /** 实退金额 */
    private BigDecimal refundMoney;
    /** 实退原因 */
    private String refundReason;
}