no message
This commit is contained in:
parent
f1328d4db8
commit
affce5e1b4
|
|
@ -807,6 +807,11 @@ public class OrderDetailServiceImpl implements OrderDetailService {
|
||||||
ArrayList<DivMember> divMembers = new ArrayList<>();
|
ArrayList<DivMember> divMembers = new ArrayList<>();
|
||||||
// 承担手续费的标志 如果平台抽成为0则大师傅承担手续费 如果大师傅抽成也为0 则由上门师傅自己承担手续费
|
// 承担手续费的标志 如果平台抽成为0则大师傅承担手续费 如果大师傅抽成也为0 则由上门师傅自己承担手续费
|
||||||
boolean feeFlag = false;
|
boolean feeFlag = false;
|
||||||
|
if (MoneyUtil.gt0(platformFee)&&MoneyUtil.gt0(retainRate)){
|
||||||
|
divMembers.add(new DivMember("0", MoneyUtil.toS(platformFee.add(retainRateMoney)), true));
|
||||||
|
workerFee = workerFee.subtract(platformFee).subtract(retainRateMoney);
|
||||||
|
feeFlag = true;
|
||||||
|
}else{
|
||||||
if (MoneyUtil.gt0(platformFee)) {
|
if (MoneyUtil.gt0(platformFee)) {
|
||||||
divMembers.add(new DivMember("0", MoneyUtil.toS(platformFee), true));
|
divMembers.add(new DivMember("0", MoneyUtil.toS(platformFee), true));
|
||||||
workerFee = workerFee.subtract(platformFee);
|
workerFee = workerFee.subtract(platformFee);
|
||||||
|
|
@ -814,10 +819,12 @@ public class OrderDetailServiceImpl implements OrderDetailService {
|
||||||
}
|
}
|
||||||
//截留扣点
|
//截留扣点
|
||||||
if (MoneyUtil.gt0(retainRate)) {
|
if (MoneyUtil.gt0(retainRate)) {
|
||||||
divMembers.add(new DivMember("0", MoneyUtil.toS(retainRateMoney), true));
|
divMembers.add(new DivMember("0", MoneyUtil.toS(retainRateMoney), false));
|
||||||
workerFee = workerFee.subtract(retainRateMoney);
|
workerFee = workerFee.subtract(retainRateMoney);
|
||||||
feeFlag = true;
|
feeFlag = true;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (MoneyUtil.gt0(placeOneMoney) && StringUtils.isNotEmpty(placeOne)) {
|
if (MoneyUtil.gt0(placeOneMoney) && StringUtils.isNotEmpty(placeOne)) {
|
||||||
divMembers.add(new DivMember(placeOne, MoneyUtil.toS(placeOneMoney), !feeFlag));
|
divMembers.add(new DivMember(placeOne, MoneyUtil.toS(placeOneMoney), !feeFlag));
|
||||||
workerFee = workerFee.subtract(placeOneMoney);
|
workerFee = workerFee.subtract(placeOneMoney);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue