|
|
|
@@ -146,6 +146,9 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ |
|
|
|
WxMerchantTradeDailyVo trade = recordMap.get(fmt.format(cal.getTime())); |
|
|
|
if (trade != null){ |
|
|
|
trade.setReportDate(fmtv.format(cal.getTime())); |
|
|
|
trade.setTenantId(null); |
|
|
|
trade.setMerchantId(null); |
|
|
|
trade.setMerchantName(null); |
|
|
|
tradeList.add(trade); |
|
|
|
}else { |
|
|
|
trade = new WxMerchantTradeDailyVo(); |
|
|
|
@@ -158,6 +161,38 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ |
|
|
|
return new ResultData(tradeList); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultData getVolumeTotalOfMonth(String tenantId) { |
|
|
|
|
|
|
|
|
|
|
|
WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); |
|
|
|
wxMerchantTradeDaily.setTenantId(tenantId); |
|
|
|
|
|
|
|
List<WxMerchantTradeDaily> recordList = wxMerchantTradeDailyMapper.findTotalListOfMonth(wxMerchantTradeDaily); |
|
|
|
Map<String,WxMerchantTradeDaily> recordMap = recordList.stream().collect(Collectors.toMap(WxMerchantTradeDaily::getReportDate, r -> r)); |
|
|
|
|
|
|
|
List<WxMerchantTradeDaily> tradeList = new ArrayList<>(); |
|
|
|
Calendar cal = Calendar.getInstance(); |
|
|
|
SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
SimpleDateFormat fmtv = new SimpleDateFormat("MM/dd"); |
|
|
|
cal.setTime(new Date()); |
|
|
|
for (int i = 0; i < 30; i++) { |
|
|
|
cal.add(Calendar.DAY_OF_YEAR, -1); |
|
|
|
WxMerchantTradeDaily trade = recordMap.get(fmt.format(cal.getTime())); |
|
|
|
if (trade != null){ |
|
|
|
trade.setReportDate(fmtv.format(cal.getTime())); |
|
|
|
tradeList.add(trade); |
|
|
|
}else { |
|
|
|
trade = new WxMerchantTradeDaily(); |
|
|
|
trade.setTradeAmt(0); |
|
|
|
trade.setReportDate(fmtv.format(cal.getTime())); |
|
|
|
tradeList.add(trade); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
return new ResultData(tradeList); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultData getVolume(Long userId) { |
|
|
|
|
|
|
|
|