diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java index 851ba5966..539ad4a7f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java @@ -46,6 +46,13 @@ public class WxMerchantTradeDaily implements Serializable { @Transient private String month; + @Transient + private String starttime; + + @Transient + private String endtime; + + public Integer getTradeAmtInteger(){ if (StringUtils.isBlank(tradeAmt)){ return 0; 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 56ff78f5e..db57ae190 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -13,6 +13,7 @@ import com.iformall.domain.po.WxMerchantTradeDaily; import com.iformall.domain.vo.WxMerchantTradeDailyVo; import com.iformall.mapper.WxMerchantTradeDailyMapper; import com.iformall.service.*; +import com.iformall.utils.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -185,6 +186,10 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); wxMerchantTradeDaily.setTenantId(wxMerchantTradeDailyVo.getTenantId()); wxMerchantTradeDaily.setMerchantId(wxMerchantTradeDailyVo.getMerchantId()); + String endtime = DateUtils.getTimeBefore(30, new Date()); + String starttime = DateUtils.getSystemTime("yyyy-MM-dd"); + wxMerchantTradeDaily.setStarttime(starttime); + wxMerchantTradeDaily.setEndtime(endtime); List list = wxMerchantTradeDailyMapper.findListVoOfMonth(wxMerchantTradeDaily); String title = "近30天解单数据"; excelService.exportExcel(list, title, name, WxMerchantTradeDailyVo.class, name + ".xlsx", response, false); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml index c05bc0e7e..336773e69 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml @@ -160,6 +160,11 @@ and mtd.merchant_id = #{merchantId} + + + and mtd.report_date between #{starttime} and #{endtime} + + order by mtd.create_date desc LIMIT 30