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

Commit 29a91cd9 authored by jiangxiulong's avatar jiangxiulong

isRefundExpressNew 判断

parent d2965620
...@@ -129,6 +129,7 @@ public class KylinOrderTicketsRefundServiceImpl { ...@@ -129,6 +129,7 @@ public class KylinOrderTicketsRefundServiceImpl {
// 快递费 判断是否是最后一张入场人票 减去已经退的快递费 // 快递费 判断是否是最后一张入场人票 减去已经退的快递费
BigDecimal canRefundPriceExpress = BigDecimal.valueOf(0); BigDecimal canRefundPriceExpress = BigDecimal.valueOf(0);
// 正在和已经退的快递票金额 正在和已经退的票数量 // 正在和已经退的快递票金额 正在和已经退的票数量
if (performanceVo.getIsRefundExpressNew() == 1) {
Integer refundNum = 0; Integer refundNum = 0;
BigDecimal priceExpressOld = BigDecimal.valueOf(0); BigDecimal priceExpressOld = BigDecimal.valueOf(0);
for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) { for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
...@@ -141,6 +142,7 @@ public class KylinOrderTicketsRefundServiceImpl { ...@@ -141,6 +142,7 @@ public class KylinOrderTicketsRefundServiceImpl {
if (refundNum + 1 == orderTicketVo.getNumber()) { if (refundNum + 1 == orderTicketVo.getNumber()) {
canRefundPriceExpress = orderTicketVo.getPriceExpress().subtract(priceExpressOld); canRefundPriceExpress = orderTicketVo.getPriceExpress().subtract(priceExpressOld);
} }
}
// 整理返回数据 // 整理返回数据
BeanUtils.copyProperties(orderTicketVo, vo); BeanUtils.copyProperties(orderTicketVo, vo);
vo.setIsRefundPoundage(performanceVo.getIsRefundPoundage()); vo.setIsRefundPoundage(performanceVo.getIsRefundPoundage());
...@@ -236,6 +238,7 @@ public class KylinOrderTicketsRefundServiceImpl { ...@@ -236,6 +238,7 @@ public class KylinOrderTicketsRefundServiceImpl {
// 快递费 判断是否是最后一张入场人票 减去已经退的快递费 // 快递费 判断是否是最后一张入场人票 减去已经退的快递费
BigDecimal priceExpress = BigDecimal.valueOf(0); BigDecimal priceExpress = BigDecimal.valueOf(0);
// 正在和已经退的快递票金额 正在和已经退的票数量 // 正在和已经退的快递票金额 正在和已经退的票数量
if (performanceVo.getIsRefundExpressNew() == 1) {
Integer refundNum = 0; Integer refundNum = 0;
BigDecimal priceExpressOld = BigDecimal.valueOf(0); BigDecimal priceExpressOld = BigDecimal.valueOf(0);
for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) { for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
...@@ -248,6 +251,7 @@ public class KylinOrderTicketsRefundServiceImpl { ...@@ -248,6 +251,7 @@ public class KylinOrderTicketsRefundServiceImpl {
if (refundNum + 1 == orderTicketVo.getNumber()) { if (refundNum + 1 == orderTicketVo.getNumber()) {
priceExpress = orderTicketVo.getPriceExpress().subtract(priceExpressOld); priceExpress = orderTicketVo.getPriceExpress().subtract(priceExpressOld);
} }
}
Map token = CurrentUtil.getTokenClaims(); Map token = CurrentUtil.getTokenClaims();
String username = StringUtils.defaultString(((String) token.get("nickname")), ""); String username = StringUtils.defaultString(((String) token.get("nickname")), "");
......
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