mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-05-09 04:20:08 +08:00
新增刷数据接口
This commit is contained in:
@@ -174,6 +174,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
|
|||||||
}
|
}
|
||||||
// 订单总消费金额
|
// 订单总消费金额
|
||||||
BigDecimal orderAmount = new BigDecimal(orderListVO.getOrderAmount());
|
BigDecimal orderAmount = new BigDecimal(orderListVO.getOrderAmount());
|
||||||
|
// 支付金额
|
||||||
|
BigDecimal payAmount = new BigDecimal(orderListVO.getPayAmount());
|
||||||
|
|
||||||
|
if (orderAmount.compareTo(payAmount) > 0) {
|
||||||
|
orderAmount = payAmount;
|
||||||
|
}
|
||||||
|
|
||||||
// 使用虚拟金额消费 金额
|
// 使用虚拟金额消费 金额
|
||||||
BigDecimal virtualAmount = BigDecimal.ZERO;
|
BigDecimal virtualAmount = BigDecimal.ZERO;
|
||||||
@@ -215,6 +221,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
|
|||||||
OrderBasicInfo build = OrderBasicInfo.builder()
|
OrderBasicInfo build = OrderBasicInfo.builder()
|
||||||
.id(Long.parseLong(orderListVO.getId()))
|
.id(Long.parseLong(orderListVO.getId()))
|
||||||
.orderCode(orderListVO.getOrderCode())
|
.orderCode(orderListVO.getOrderCode())
|
||||||
|
.orderAmount(orderAmount)
|
||||||
.virtualAmount(virtualAmount)
|
.virtualAmount(virtualAmount)
|
||||||
.settleAmount(settleAmount)
|
.settleAmount(settleAmount)
|
||||||
.build();
|
.build();
|
||||||
|
|||||||
Reference in New Issue
Block a user