Merge remote-tracking branch 'origin/master'

dev
xiaocui 2021-03-30 20:01:09 +08:00
commit 704539b02c
1 changed files with 3 additions and 2 deletions

View File

@ -734,8 +734,9 @@ public class OrderTempSyncService {
transport.setArriveTime(now); transport.setArriveTime(now);
transport.setType(OrderTypeEnum.TEMP.getTypeid()); transport.setType(OrderTypeEnum.TEMP.getTypeid());
if (prepayCustomer.getSurplus().compareTo(order.getTotalPrice()) < 1) { // 客户账户可用余额要可以支付本次订单
return Result.failedstr("总价 %.2f,客户余额(%.2f)不足以支付"); if (availableBalance.compareTo(order.getTotalPrice()) < 1) {
return Result.failedstr("总价 %.2f,客户可用余额(%.2f)不足以支付", order.getTotalPrice(), availableBalance);
} }
InvoiceReceive finalReceive = receive; InvoiceReceive finalReceive = receive;