| @@ -1965,11 +1965,24 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| result.put("pressPaymentHistory",pressPaymentHistoryMap); | result.put("pressPaymentHistory",pressPaymentHistoryMap); | ||||
| wxCoupon.setTenantId(tenantId); | wxCoupon.setTenantId(tenantId); | ||||
| result.put("pressSendHistoryTotal",getTotal(pressSendHistoryMap)); | |||||
| result.put("pressSuccHistoryCount",getTotal(pressSuccHistoryMap)); | |||||
| result.put("pressPaymentHistoryCount",getTotal(pressPaymentHistoryMap)); | |||||
| result.put("pressSuccRate",wxCouponService.pressSuccRate(wxCoupon)); | result.put("pressSuccRate",wxCouponService.pressSuccRate(wxCoupon)); | ||||
| result.put("sumJoin",wxCouponService.sumJoin(wxCoupon)); | result.put("sumJoin",wxCouponService.sumJoin(wxCoupon)); | ||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| public int getTotal(Map<String,String> map){ | |||||
| int tatal = 0; | |||||
| for (String key:map.keySet()) { | |||||
| tatal += Integer.parseInt(map.get(key)); | |||||
| } | |||||
| return tatal; | |||||
| } | |||||
| private Date getMonthFirstDay() { | private Date getMonthFirstDay() { | ||||
| Calendar c = Calendar.getInstance(); | Calendar c = Calendar.getInstance(); | ||||
| c.add(Calendar.MONTH, 0); | c.add(Calendar.MONTH, 0); | ||||
| @@ -2048,7 +2061,6 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| result.put("transferRatio", transferRatio); | result.put("transferRatio", transferRatio); | ||||
| result.put("verifyCount", verifyCount); | result.put("verifyCount", verifyCount); | ||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||