|
@@ -200,9 +200,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
try {
|
|
try {
|
|
ChargeVO chargeVo = new ChargeVO();
|
|
ChargeVO chargeVo = new ChargeVO();
|
|
chargeVo.setSeq(order.getId());
|
|
chargeVo.setSeq(order.getId());
|
|
- Optional.ofNullable(order.getRealMoney())
|
|
|
|
- .ifPresent(order::setMoney);
|
|
|
|
chargeVo.setAmt(order.getMoney());
|
|
chargeVo.setAmt(order.getMoney());
|
|
|
|
+ if (null != order.getRealMoney() && order.getMoney().compareTo(BigDecimal.ZERO) != 0){
|
|
|
|
+ chargeVo.setAmt(order.getRealMoney());
|
|
|
|
+ }
|
|
chargeVo.setCard(order.getCard());
|
|
chargeVo.setCard(order.getCard());
|
|
chargeVo.setMob(order.getOrderNumber());
|
|
chargeVo.setMob(order.getOrderNumber());
|
|
MsgLog msgLog = new MsgLog();
|
|
MsgLog msgLog = new MsgLog();
|