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

Skip to content

L
liquidnet-bus-v1
Commit 29a91cd9 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

isRefundExpressNew 判断

parent d2965620
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 20 deletions
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsRefundServiceImpl.java
View file @ 29a91cd9
...@@ -129,17 +129,19 @@ public class KylinOrderTicketsRefundServiceImpl { ...@@ -129,17 +129,19 @@ public class KylinOrderTicketsRefundServiceImpl {
// 快递费 判断是否是最后一张入场人票 减去已经退的快递费 // 快递费 判断是否是最后一张入场人票 减去已经退的快递费
BigDecimal canRefundPriceExpress = BigDecimal.valueOf(0); BigDecimal canRefundPriceExpress = BigDecimal.valueOf(0);
// 正在和已经退的快递票金额 正在和已经退的票数量 // 正在和已经退的快递票金额 正在和已经退的票数量
Integer refundNum = 0; if (performanceVo.getIsRefundExpressNew() == 1) {
BigDecimal priceExpressOld = BigDecimal.valueOf(0); Integer refundNum = 0;
for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) { BigDecimal priceExpressOld = BigDecimal.valueOf(0);
int status = refundVo.getStatus(); for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
if (status != KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL && status != KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT) { //退款流程未完成和已完成的 int status = refundVo.getStatus();
refundNum ++; if (status != KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL && status != KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT) { //退款流程未完成和已完成的
priceExpressOld = priceExpressOld.add(refundVo.getPriceExpress()); refundNum ++;
priceExpressOld = priceExpressOld.add(refundVo.getPriceExpress());
}
}
if (refundNum + 1 == orderTicketVo.getNumber()) {
canRefundPriceExpress = orderTicketVo.getPriceExpress().subtract(priceExpressOld);
} }
}
if (refundNum + 1 == orderTicketVo.getNumber()) {
canRefundPriceExpress = orderTicketVo.getPriceExpress().subtract(priceExpressOld);
} }
// 整理返回数据 // 整理返回数据
BeanUtils.copyProperties(orderTicketVo, vo); BeanUtils.copyProperties(orderTicketVo, vo);
...@@ -236,17 +238,19 @@ public class KylinOrderTicketsRefundServiceImpl { ...@@ -236,17 +238,19 @@ public class KylinOrderTicketsRefundServiceImpl {
// 快递费 判断是否是最后一张入场人票 减去已经退的快递费 // 快递费 判断是否是最后一张入场人票 减去已经退的快递费
BigDecimal priceExpress = BigDecimal.valueOf(0); BigDecimal priceExpress = BigDecimal.valueOf(0);
// 正在和已经退的快递票金额 正在和已经退的票数量 // 正在和已经退的快递票金额 正在和已经退的票数量
Integer refundNum = 0; if (performanceVo.getIsRefundExpressNew() == 1) {
BigDecimal priceExpressOld = BigDecimal.valueOf(0); Integer refundNum = 0;
for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) { BigDecimal priceExpressOld = BigDecimal.valueOf(0);
int status = refundVo.getStatus(); for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
if (status != KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL && status != KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT) { //退款流程未完成和已完成的 int status = refundVo.getStatus();
refundNum ++; if (status != KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL && status != KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT) { //退款流程未完成和已完成的
priceExpressOld = priceExpressOld.add(refundVo.getPriceExpress()); refundNum ++;
priceExpressOld = priceExpressOld.add(refundVo.getPriceExpress());
}
}
if (refundNum + 1 == orderTicketVo.getNumber()) {
priceExpress = orderTicketVo.getPriceExpress().subtract(priceExpressOld);
} }
}
if (refundNum + 1 == orderTicketVo.getNumber()) {
priceExpress = orderTicketVo.getPriceExpress().subtract(priceExpressOld);
} }
Map token = CurrentUtil.getTokenClaims(); Map token = CurrentUtil.getTokenClaims();
......
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