|
@@ -200,11 +200,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
try {
|
|
|
ChargeVO chargeVo = new ChargeVO();
|
|
|
chargeVo.setSeq(order.getId());
|
|
|
- Optional.ofNullable(order.getTopRadio())
|
|
|
- .ifPresent(radio -> {
|
|
|
- double mul = Arith.mul(order.getMoney().doubleValue(), order.getTopRadio());
|
|
|
- order.setMoney(BigDecimal.valueOf(mul));
|
|
|
- });
|
|
|
+ Optional.ofNullable(order.getRealMoney())
|
|
|
+ .ifPresent(order::setMoney);
|
|
|
chargeVo.setAmt(order.getMoney());
|
|
|
chargeVo.setCard(order.getCard());
|
|
|
chargeVo.setMob(order.getOrderNumber());
|
|
@@ -573,6 +570,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
Optional.ofNullable(topRadio).ifPresent(tr ->{
|
|
|
order.setIdentity(tr.getIdentity());
|
|
|
order.setTopRadio(tr.getProportion());
|
|
|
+ double mul = Arith.mul(order.getMoney().doubleValue(), order.getTopRadio());
|
|
|
+ order.setRealMoney(BigDecimal.valueOf(mul));
|
|
|
});
|
|
|
});
|
|
|
//添加卡号
|