|
|
@@ -1492,8 +1492,8 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
Map<String,Object> result = new HashedMap(); |
|
|
Map<String,Object> result = new HashedMap(); |
|
|
List<WxCoupon> saleMoneyList = wxCouponService.findSaleMoneyByDate(wxCoupon); |
|
|
List<WxCoupon> saleMoneyList = wxCouponService.findSaleMoneyByDate(wxCoupon); |
|
|
List<WxCoupon> paymentList = wxCouponService.findPaymentByDate(wxCoupon); |
|
|
List<WxCoupon> paymentList = wxCouponService.findPaymentByDate(wxCoupon); |
|
|
Map<String,Long> saleMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
Map<String,Long> payMentMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
|
|
|
Map<String,String> saleMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
Map<String,String> payMentMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
|
|
|
for (WxCoupon coupon:saleMoneyList){ |
|
|
for (WxCoupon coupon:saleMoneyList){ |
|
|
saleMap.put(coupon.getXtime(),coupon.getXcount()); |
|
|
saleMap.put(coupon.getXtime(),coupon.getXcount()); |
|
|
@@ -1538,10 +1538,10 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
List<WxCoupon> priceCouponSaleCountList = wxCouponService.priceCouponSaleCount(wxCoupon); |
|
|
List<WxCoupon> priceCouponSaleCountList = wxCouponService.priceCouponSaleCount(wxCoupon); |
|
|
List<WxCoupon> priceCouponPaymentCountList = wxCouponService.priceCouponPaymentCount(wxCoupon); |
|
|
List<WxCoupon> priceCouponPaymentCountList = wxCouponService.priceCouponPaymentCount(wxCoupon); |
|
|
|
|
|
|
|
|
Map<String,Long> orderCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
Map<String,Long> paymentCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
Map<String,Long> priceCouponSaleCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
Map<String,Long> priceCouponPaymentCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
|
|
|
Map<String,String> orderCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
Map<String,String> paymentCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
Map<String,String> priceCouponSaleCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
Map<String,String> priceCouponPaymentCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
|
|
|
for (WxCoupon coupon:orderCountList){ |
|
|
for (WxCoupon coupon:orderCountList){ |
|
|
orderCountMap.put(coupon.getXtime(),coupon.getXcount()); |
|
|
orderCountMap.put(coupon.getXtime(),coupon.getXcount()); |
|
|
@@ -1594,9 +1594,9 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
List<WxCoupon> pressSuccHistory = wxCouponService.pressSuccHistory(wxCoupon); |
|
|
List<WxCoupon> pressSuccHistory = wxCouponService.pressSuccHistory(wxCoupon); |
|
|
List<WxCoupon> pressPaymentHistory = wxCouponService.pressPaymentHistory(wxCoupon); |
|
|
List<WxCoupon> pressPaymentHistory = wxCouponService.pressPaymentHistory(wxCoupon); |
|
|
|
|
|
|
|
|
Map<String,Long> pressSendHistoryMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
Map<String,Long> pressSuccHistoryMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
Map<String,Long> pressPaymentHistoryMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
|
|
|
Map<String,String> pressSendHistoryMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
Map<String,String> pressSuccHistoryMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
Map<String,String> pressPaymentHistoryMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); |
|
|
|
|
|
|
|
|
for (WxCoupon coupon:pressSendHistory){ |
|
|
for (WxCoupon coupon:pressSendHistory){ |
|
|
pressSendHistoryMap.put(coupon.getXtime(),coupon.getXcount()); |
|
|
pressSendHistoryMap.put(coupon.getXtime(),coupon.getXcount()); |
|
|
@@ -1646,8 +1646,8 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
List<Map<String, Object>> successlist = wxOrderGroupMapper.queryOrderGroupSuccessCountAndTime(params); |
|
|
List<Map<String, Object>> successlist = wxOrderGroupMapper.queryOrderGroupSuccessCountAndTime(params); |
|
|
List<Map<String, Object>> verifyList = wxOrderGroupMapper.queryOrderGroupVerifyCountAndTime(params); |
|
|
List<Map<String, Object>> verifyList = wxOrderGroupMapper.queryOrderGroupVerifyCountAndTime(params); |
|
|
|
|
|
|
|
|
Map<String, Long> successMap = getDateMap(startTime, endTime); |
|
|
|
|
|
Map<String, Long> verifyMap = getDateMap(startTime, endTime); |
|
|
|
|
|
|
|
|
Map<String, String> successMap = getDateMap(startTime, endTime); |
|
|
|
|
|
Map<String, String> verifyMap = getDateMap(startTime, endTime); |
|
|
|
|
|
|
|
|
long successCount = wxOrderGroupMapper.queryOrderGroupSuccessCount(params); |
|
|
long successCount = wxOrderGroupMapper.queryOrderGroupSuccessCount(params); |
|
|
long groupCount = wxOrderGroupMapper.queryOrderGroupCount(params); |
|
|
long groupCount = wxOrderGroupMapper.queryOrderGroupCount(params); |
|
|
@@ -1658,16 +1658,16 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
transferRatio = new BigDecimal(transfer).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); |
|
|
transferRatio = new BigDecimal(transfer).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
Map<String, Long> successListMap = successlist.parallelStream().collect(Collectors.toMap(x -> { |
|
|
|
|
|
|
|
|
Map<String, String> successListMap = successlist.parallelStream().collect(Collectors.toMap(x -> { |
|
|
return x.get("time").toString(); |
|
|
return x.get("time").toString(); |
|
|
}, x -> { |
|
|
}, x -> { |
|
|
return (long) x.get("total"); |
|
|
|
|
|
|
|
|
return (String) x.get("total"); |
|
|
})); |
|
|
})); |
|
|
|
|
|
|
|
|
Map<String, Long> verifyListMap = verifyList.parallelStream().collect(Collectors.toMap(x -> { |
|
|
|
|
|
|
|
|
Map<String, String> verifyListMap = verifyList.parallelStream().collect(Collectors.toMap(x -> { |
|
|
return x.get("time").toString(); |
|
|
return x.get("time").toString(); |
|
|
}, x -> { |
|
|
}, x -> { |
|
|
return (long) x.get("total"); |
|
|
|
|
|
|
|
|
return (String) x.get("total"); |
|
|
})); |
|
|
})); |
|
|
|
|
|
|
|
|
successMap.putAll(successListMap); |
|
|
successMap.putAll(successListMap); |
|
|
@@ -1768,10 +1768,10 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
return vo; |
|
|
return vo; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public static Map<String,Long> getDateMap(Date begin, Date end) { |
|
|
|
|
|
|
|
|
public static Map<String,String> getDateMap(Date begin, Date end) { |
|
|
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
Map<String,Long> map = new LinkedHashMap<>(); |
|
|
|
|
|
map.put(format.format(begin), 0L); |
|
|
|
|
|
|
|
|
Map<String,String> map = new LinkedHashMap<>(); |
|
|
|
|
|
map.put(format.format(begin), "0"); |
|
|
Calendar calBegin = Calendar.getInstance(); |
|
|
Calendar calBegin = Calendar.getInstance(); |
|
|
calBegin.setTime(begin); |
|
|
calBegin.setTime(begin); |
|
|
Calendar calEnd = Calendar.getInstance(); |
|
|
Calendar calEnd = Calendar.getInstance(); |
|
|
@@ -1780,7 +1780,7 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
end = calEnd.getTime(); |
|
|
end = calEnd.getTime(); |
|
|
while (calBegin.getTime().before(end)) { |
|
|
while (calBegin.getTime().before(end)) { |
|
|
calBegin.add(Calendar.DAY_OF_MONTH, 1); |
|
|
calBegin.add(Calendar.DAY_OF_MONTH, 1); |
|
|
map.put(format.format(calBegin.getTime()), 0L); |
|
|
|
|
|
|
|
|
map.put(format.format(calBegin.getTime()), "0"); |
|
|
} |
|
|
} |
|
|
return map; |
|
|
return map; |
|
|
} |
|
|
} |
|
|
|