diff --git a/mallinkService/src/main/java/com/simple/domain/vo/AmountRecordVo.java b/mallinkService/src/main/java/com/simple/domain/vo/AmountRecordVo.java index cfca6e507..3ab1f4265 100644 --- a/mallinkService/src/main/java/com/simple/domain/vo/AmountRecordVo.java +++ b/mallinkService/src/main/java/com/simple/domain/vo/AmountRecordVo.java @@ -1,6 +1,7 @@ package com.simple.domain.vo; import java.io.Serializable; +import java.text.DecimalFormat; /** * 交易记录核销记录Vo * @author jinguo @@ -15,10 +16,61 @@ public class AmountRecordVo implements Serializable{ * */ private static final long serialVersionUID = 4494858079134918638L; - - List orderAmountList; + //交易金额记录 + private List orderAmountList; + //核销金额记录 + private List verifyAmountList; + + private Integer orderAmount; + + private String orderAmountStr; - List verifyAmountList; + private Integer verifyAmount; + + private String verifyAmountStr; + + public String getOrderAmountStr() { + if(orderAmount!=null) { + DecimalFormat df=new DecimalFormat("0.00"); + orderAmountStr = df.format((float)orderAmount/100); + } + return orderAmountStr; + } + + public String getVerifyAmountStr() { + if(verifyAmount!=null) { + DecimalFormat df=new DecimalFormat("0.00"); + verifyAmountStr = df.format((float)verifyAmount/100); + } + return verifyAmountStr; + } + + public Integer getOrderAmount() { + return orderAmount; + } + + public void setOrderAmount(Integer orderAmount) { + this.orderAmount = orderAmount; + } + + public Integer getVerifyAmount() { + return verifyAmount; + } + + public void setVerifyAmount(Integer verifyAmount) { + this.verifyAmount = verifyAmount; + } + + public void setOrderAmountStr(String orderAmountStr) { + this.orderAmountStr = orderAmountStr; + } + + public void setVerifyAmountStr(String verifyAmountStr) { + this.verifyAmountStr = verifyAmountStr; + } + + + public List getOrderAmountList() { return orderAmountList;