订单退款
This commit is contained in:
parent
d941ea49d3
commit
a475847780
|
@ -2119,9 +2119,9 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
|||
//项目扣款
|
||||
BigDecimal massageMoneyDeduction = BigDecimal.ZERO;
|
||||
if(massageRate.compareTo(BigDecimal.ZERO) == 0){
|
||||
massageMoneyDeduction = orders.getPayMoney().subtract(orders.getTaxiMoney()).multiply(massageRate);
|
||||
}else{
|
||||
massageMoneyDeduction = massageDeduction;
|
||||
}else{
|
||||
massageMoneyDeduction = orders.getPayMoney().subtract(orders.getTaxiMoney()).multiply(massageRate);
|
||||
}
|
||||
if(orders.getPayMoney().subtract(orders.getTaxiMoney()).compareTo(massageDeduction) < 0){
|
||||
massageMoneyDeduction = orders.getPayMoney().subtract(orders.getTaxiMoney());
|
||||
|
@ -2129,9 +2129,9 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
|||
//车费扣款
|
||||
BigDecimal taxiMoneyDeduction = BigDecimal.ZERO;
|
||||
if(trafficRate.compareTo(BigDecimal.ZERO) == 0){
|
||||
taxiMoneyDeduction = orders.getTaxiMoney().multiply(trafficRate);
|
||||
}else{
|
||||
taxiMoneyDeduction = trafficDeduction;
|
||||
}else{
|
||||
taxiMoneyDeduction = orders.getTaxiMoney().multiply(trafficRate);
|
||||
}
|
||||
if(orders.getTaxiMoney().compareTo(taxiMoneyDeduction) < 0){
|
||||
taxiMoneyDeduction = orders.getTaxiMoney();
|
||||
|
@ -2291,12 +2291,12 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
|||
if (orders.getShopUserId() != null) {
|
||||
userMoneyDetails.setContent("用户取消订单,总扣除:" + sumMoney + ",平台扣除:" + orders.getPingMoney() +
|
||||
",商家扣除:" + orders.getShopMoney() + ",用户代理扣除:" + orders.getOneUserMoney() + ",技师代理扣除:" + orders.getOneArtificerMoney() +
|
||||
",打车费:" + orders.getTaxiMoney() +
|
||||
",打车费:" + orders.getTaxiMoney() + ",平台扣除打车费:" + orders.getPingTaxiMoney() + ",到账打车费:" + orders.getArtificerTaxiMoney() +
|
||||
",到账总金额:" + orders.getSumArtificerMoney());
|
||||
} else {
|
||||
userMoneyDetails.setContent("用户取消订单,总扣除:" + sumMoney + ",平台扣除:" + orders.getPingMoney() +
|
||||
",用户代理扣除:" + orders.getOneUserMoney() + ",技师代理扣除:" + orders.getOneArtificerMoney() +
|
||||
",打车费:" + orders.getTaxiMoney() +
|
||||
",打车费:" + orders.getTaxiMoney() + ",平台扣除打车费:" + orders.getPingTaxiMoney() + ",到账打车费:" + orders.getArtificerTaxiMoney() +
|
||||
",到账总金额:" + orders.getSumArtificerMoney());
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue