diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index 38a9e3f50..b230803ee 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -111,6 +111,10 @@ public class WxMerchantTradeDailyController extends BaseController { wxMerchantTradeDaily = new WxMerchantTradeDailyVo(); } wxMerchantTradeDaily.setTenantId(getTenantId()); + if (wxMerchantTradeDaily.getReportDate() == null) { + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); + wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); + } wxMerchantTradeDaily.setSortColumns(WxMerchantTradeDailyVo.Field.MerchantId_DESC); wxMerchantTradeDailyService.exportData(wxMerchantTradeDaily, request, response); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java index 3007a0094..b78a8f3e7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java @@ -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; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index 4ae5df1ba..56ff78f5e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -177,8 +177,9 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ //没有商户ID导出全部数据 String name = "解单数据"; if (wxMerchantTradeDailyVo.getMerchantId() == null) { - String title = wxMerchantTradeDailyVo.getReportDate() + "商户解单数据"; + String title = "商户解单数据"; List list = wxMerchantTradeDailyMapper.findListVo(wxMerchantTradeDailyVo); + list.parallelStream().forEach(t -> t.setReportDate(wxMerchantTradeDailyVo.getReportDate())); excelService.exportExcel(list, title, name, WxMerchantTradeDailyVo.class, name + ".xlsx", response, false); } else { WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); @@ -186,10 +187,6 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setMerchantId(wxMerchantTradeDailyVo.getMerchantId()); List list = wxMerchantTradeDailyMapper.findListVoOfMonth(wxMerchantTradeDaily); String title = "近30天解单数据"; - if (!list.isEmpty()) { - String merchantName = list.get(0).getMerchantName(); - title = merchantName + title; - } excelService.exportExcel(list, title, name, WxMerchantTradeDailyVo.class, name + ".xlsx", response, false); } } @@ -329,8 +326,4 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ } - - - - }