diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index fe16f860b..632b29e00 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -174,6 +174,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } // 订单总消费金额 BigDecimal orderAmount = new BigDecimal(orderListVO.getOrderAmount()); + // 支付金额 + BigDecimal payAmount = new BigDecimal(orderListVO.getPayAmount()); + + if (orderAmount.compareTo(payAmount) > 0) { + orderAmount = payAmount; + } // 使用虚拟金额消费 金额 BigDecimal virtualAmount = BigDecimal.ZERO; @@ -215,6 +221,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { OrderBasicInfo build = OrderBasicInfo.builder() .id(Long.parseLong(orderListVO.getId())) .orderCode(orderListVO.getOrderCode()) + .orderAmount(orderAmount) .virtualAmount(virtualAmount) .settleAmount(settleAmount) .build();