diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderSplitDailySummaryData.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderSplitDailySummaryData.java index 522257a02..e7a2a4a2e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderSplitDailySummaryData.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderSplitDailySummaryData.java @@ -1,6 +1,8 @@ package com.jsowell.pile.vo.web; import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import java.math.BigDecimal; import java.util.List; @@ -67,4 +69,20 @@ public class OrderSplitDailySummaryData { */ private List otherSplitDetailList; + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.JSON_STYLE) + .append("tradeDate", tradeDate) + .append("merchantId", merchantId) + .append("orderCount", orderCount) + .append("totalOrderAmount", totalOrderAmount) + .append("totalSettleAmount", totalSettleAmount) + .append("merchantSplitAmount", merchantSplitAmount) + .append("merchantFeeAmount", merchantFeeAmount) + .append("merchantElecAmount", merchantElecAmount) + .append("merchantServiceAmount", merchantServiceAmount) + .append("otherSplitAmount", otherSplitAmount) + .append("otherSplitDetailList", otherSplitDetailList) + .toString(); + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SettleOrderReportVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SettleOrderReportVO.java index 7c4ad7d04..ae22e6243 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SettleOrderReportVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SettleOrderReportVO.java @@ -1,6 +1,8 @@ package com.jsowell.pile.vo.web; import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import java.math.BigDecimal; @@ -86,4 +88,25 @@ public class SettleOrderReportVO { * 交易手续费 */ private BigDecimal tradeFee; + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.JSON_STYLE) + .append("id", id) + .append("merchantId", merchantId) + .append("stationId", stationId) + .append("stationName", stationName) + .append("useElectricity", useElectricity) + .append("chargeNum", chargeNum) + .append("chargeTime", chargeTime) + .append("electricityAmount", electricityAmount) + .append("serviceAmount", serviceAmount) + .append("totalAmount", totalAmount) + .append("virtualAmount", virtualAmount) + .append("settleAmount", settleAmount) + .append("tradeDate", tradeDate) + .append("tradeAmount", tradeAmount) + .append("tradeFee", tradeFee) + .toString(); + } }