diff --git a/src/main/java/com/m2pool/lease/dto/OrderInfoDto.java b/src/main/java/com/m2pool/lease/dto/OrderInfoDto.java index 8262a30..66f21b7 100644 --- a/src/main/java/com/m2pool/lease/dto/OrderInfoDto.java +++ b/src/main/java/com/m2pool/lease/dto/OrderInfoDto.java @@ -93,6 +93,9 @@ public class OrderInfoDto { @ApiModelProperty(value = "店铺名称") private String shopName; + @ApiModelProperty(value = "支付币种(单位)") + private String payCoin; + //---------------------------------------------- 一个普通订单对应一个支付订单(多个封装下面四个字段为一个对象,并返回list)- ---------------------------------------------------------------------- /** * 订单详情 diff --git a/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java b/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java index 491c1a0..645e38c 100644 --- a/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java +++ b/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java @@ -523,6 +523,7 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl 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());