记得上下班打卡 | git大法好,push需谨慎

Commit ebca4978 authored by jiangxiulong's avatar jiangxiulong

点击申请退款详情 增加是否需要归还纸质演出票字段

parent fbd20003
...@@ -88,6 +88,8 @@ public class KylinOrderTicketPreVo implements Serializable, Cloneable { ...@@ -88,6 +88,8 @@ public class KylinOrderTicketPreVo implements Serializable, Cloneable {
private Integer isRefundVoucher; private Integer isRefundVoucher;
@ApiModelProperty(value = "isRefundExpress 1用户承担 0无") @ApiModelProperty(value = "isRefundExpress 1用户承担 0无")
private Integer isRefundExpress; private Integer isRefundExpress;
@ApiModelProperty(value = "是否需要归还纸质演出票 1需要 0不需要")
private Integer isBackPaperTicket;
@ApiModelProperty(value = "手续费规则列表") @ApiModelProperty(value = "手续费规则列表")
private OrderRefundPoundageAll refundPoundageAll; private OrderRefundPoundageAll refundPoundageAll;
......
...@@ -107,7 +107,6 @@ public class KylinOrderTicketsRefundServiceImpl { ...@@ -107,7 +107,6 @@ public class KylinOrderTicketsRefundServiceImpl {
item.setChargesRatio(chargesRatio); item.setChargesRatio(chargesRatio);
item.setChargesPrice(chargesPrice); item.setChargesPrice(chargesPrice);
// 手续费处理
BeanUtils.copyProperties(item, refundVo); BeanUtils.copyProperties(item, refundVo);
kylinOrderTicketEntitiesPreRefundVos.add(refundVo); kylinOrderTicketEntitiesPreRefundVos.add(refundVo);
} }
...@@ -130,6 +129,7 @@ public class KylinOrderTicketsRefundServiceImpl { ...@@ -130,6 +129,7 @@ public class KylinOrderTicketsRefundServiceImpl {
BeanUtils.copyProperties(orderTicketVo, vo); BeanUtils.copyProperties(orderTicketVo, vo);
vo.setIsRefundPoundage(performanceVo.getIsRefundPoundage()); vo.setIsRefundPoundage(performanceVo.getIsRefundPoundage());
vo.setIsRefundVoucher(performanceVo.getIsRefundVoucher()); vo.setIsRefundVoucher(performanceVo.getIsRefundVoucher());
vo.setIsBackPaperTicket(performanceVo.getIsBackPaperTicket());
vo.setRefundPoundageAll(refundPoundageAll); vo.setRefundPoundageAll(refundPoundageAll);
vo.setOrderCouponList(orderCoupon); vo.setOrderCouponList(orderCoupon);
vo.setRefundAddress(refundAddress); vo.setRefundAddress(refundAddress);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment