|
|
|
@@ -8,6 +8,8 @@ import lombok.ToString; |
|
|
|
|
|
|
|
import javax.persistence.Id; |
|
|
|
import javax.persistence.Transient; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.math.RoundingMode; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
@@ -35,9 +37,20 @@ public class WxMerchantTradeDailyVo extends BaseEntity { |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "b用户id", name = "bUserId") |
|
|
|
private Long bUserId; |
|
|
|
|
|
|
|
@Excel(name = "解单金额(元)", width = 20, orderNum = "3") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "交易额", name = "tradeAmt") |
|
|
|
private Integer tradeAmt; |
|
|
|
|
|
|
|
@Excel(name = "解单金额(元)", width = 20, orderNum = "3") |
|
|
|
@Transient |
|
|
|
private String tradeAmtStr; |
|
|
|
|
|
|
|
public String getTradeAmtStr() { |
|
|
|
if (tradeAmt != null) { |
|
|
|
return new BigDecimal(tradeAmt).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).toPlainString(); |
|
|
|
} |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "解单提交日期", name = "createDate") |
|
|
|
private Date createDate; |
|
|
|
|
|
|
|
@@ -45,7 +58,7 @@ public class WxMerchantTradeDailyVo extends BaseEntity { |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "解单更新日期", name = "updateDate") |
|
|
|
private Date updateDate; |
|
|
|
|
|
|
|
@Excel(name = "解单日期", width = 20, orderNum = "1", format = "yyyy-MM-dd") |
|
|
|
@Excel(name = "解单日期", width = 20, orderNum = "1") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "解单日期", name = "reportDate") |
|
|
|
private String reportDate; |
|
|
|
|
|
|
|
@@ -65,6 +78,14 @@ public class WxMerchantTradeDailyVo extends BaseEntity { |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "b端用户姓名", name = "bUserName") |
|
|
|
private String bUserName; |
|
|
|
|
|
|
|
public String getbUserPhone() { |
|
|
|
return bUserPhone; |
|
|
|
} |
|
|
|
|
|
|
|
public void setbUserPhone(String bUserPhone) { |
|
|
|
this.bUserPhone = bUserPhone; |
|
|
|
} |
|
|
|
|
|
|
|
@Excel(name = "联系电话", width = 20, orderNum = "7") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "B端用户手机号", name = "bUserPhone") |
|
|
|
private String bUserPhone; |
|
|
|
@@ -75,6 +96,7 @@ public class WxMerchantTradeDailyVo extends BaseEntity { |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "凭证", name = "proof") |
|
|
|
private String proof; |
|
|
|
|
|
|
|
|
|
|
|
@Transient |
|
|
|
private Integer isToday; |
|
|
|
|
|
|
|
|