update 订单列表新增总价币种单位返回
This commit is contained in:
@@ -93,6 +93,9 @@ public class OrderInfoDto {
|
||||
@ApiModelProperty(value = "店铺名称")
|
||||
private String shopName;
|
||||
|
||||
@ApiModelProperty(value = "支付币种(单位)")
|
||||
private String payCoin;
|
||||
|
||||
//---------------------------------------------- 一个普通订单对应一个支付订单(多个封装下面四个字段为一个对象,并返回list)- ----------------------------------------------------------------------
|
||||
/**
|
||||
* 订单详情
|
||||
|
||||
@@ -523,6 +523,7 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl<LeaseOrderInfoMapper,
|
||||
.numbers(leaseOrderItem.getNumbers())
|
||||
.type(leaseOrderItem.getType() ? 1 : 0)
|
||||
.build());
|
||||
|
||||
// 累加支付金额
|
||||
hasPayAmountMap.merge(leaseOrderItem.getOrderId(), leaseOrderItem.getAlreadyPayAmount(), BigDecimal::add);
|
||||
// 累加实际支付金额
|
||||
@@ -534,6 +535,7 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl<LeaseOrderInfoMapper,
|
||||
List<OrderItemDto> orderItems = orderItemDtoMap.get(orderInfoDto.getId());
|
||||
BigDecimal hasPayAmount = hasPayAmountMap.get(orderInfoDto.getId());
|
||||
BigDecimal hasPayRealAmount = hasPayRealAmountMap.get(orderInfoDto.getId());
|
||||
orderInfoDto.setPayCoin(orderInfoDto.getPayCoin());
|
||||
orderInfoDto.setOrderItemDtoList(orderItems);
|
||||
orderInfoDto.setNoPayAmount(orderInfoDto.getTotalPrice().subtract(hasPayAmount).doubleValue());
|
||||
orderInfoDto.setPayAmount(hasPayRealAmount.doubleValue()+"/"+hasPayAmount.doubleValue());
|
||||
|
||||
Reference in New Issue
Block a user