Merge branch 'master' into ls-dev

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java

@@ -852,8 +852,9 @@ public class OrderTempSyncService {
         transport.setArriveTime(now);
         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;