diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 2ed6b9bf5..e743c3197 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -166,7 +166,7 @@ public class WxCoupon implements Serializable { @Transient private String xtime; @Transient - private Long xcount; + private String xcount; /**售出卡数量**/ @io.swagger.annotations.ApiModelProperty(value="售出卡数量",name="saleCount") @Transient @@ -259,11 +259,11 @@ public class WxCoupon implements Serializable { this.pressJoinCount = pressJoinCount; } - public Long getXcount() { + public String getXcount() { return xcount; } - public void setXcount(Long xcount) { + public void setXcount(String xcount) { this.xcount = xcount; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 7e4fe044f..5806693a8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -1492,8 +1492,8 @@ public class WxChartServiceImpl implements WxChartDataService { Map result = new HashedMap(); List saleMoneyList = wxCouponService.findSaleMoneyByDate(wxCoupon); List paymentList = wxCouponService.findPaymentByDate(wxCoupon); - Map saleMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); - Map payMentMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); + Map saleMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); + Map payMentMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); for (WxCoupon coupon:saleMoneyList){ saleMap.put(coupon.getXtime(),coupon.getXcount()); @@ -1538,10 +1538,10 @@ public class WxChartServiceImpl implements WxChartDataService { List priceCouponSaleCountList = wxCouponService.priceCouponSaleCount(wxCoupon); List priceCouponPaymentCountList = wxCouponService.priceCouponPaymentCount(wxCoupon); - Map orderCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); - Map paymentCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); - Map priceCouponSaleCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); - Map priceCouponPaymentCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); + Map orderCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); + Map paymentCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); + Map priceCouponSaleCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); + Map priceCouponPaymentCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); for (WxCoupon coupon:orderCountList){ orderCountMap.put(coupon.getXtime(),coupon.getXcount()); @@ -1594,9 +1594,9 @@ public class WxChartServiceImpl implements WxChartDataService { List pressSuccHistory = wxCouponService.pressSuccHistory(wxCoupon); List pressPaymentHistory = wxCouponService.pressPaymentHistory(wxCoupon); - Map pressSendHistoryMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); - Map pressSuccHistoryMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); - Map pressPaymentHistoryMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); + Map pressSendHistoryMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); + Map pressSuccHistoryMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); + Map pressPaymentHistoryMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); for (WxCoupon coupon:pressSendHistory){ pressSendHistoryMap.put(coupon.getXtime(),coupon.getXcount()); @@ -1646,8 +1646,8 @@ public class WxChartServiceImpl implements WxChartDataService { List> successlist = wxOrderGroupMapper.queryOrderGroupSuccessCountAndTime(params); List> verifyList = wxOrderGroupMapper.queryOrderGroupVerifyCountAndTime(params); - Map successMap = getDateMap(startTime, endTime); - Map verifyMap = getDateMap(startTime, endTime); + Map successMap = getDateMap(startTime, endTime); + Map verifyMap = getDateMap(startTime, endTime); long successCount = wxOrderGroupMapper.queryOrderGroupSuccessCount(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(); } - Map successListMap = successlist.parallelStream().collect(Collectors.toMap(x -> { + Map successListMap = successlist.parallelStream().collect(Collectors.toMap(x -> { return x.get("time").toString(); }, x -> { - return (long) x.get("total"); + return (String) x.get("total"); })); - Map verifyListMap = verifyList.parallelStream().collect(Collectors.toMap(x -> { + Map verifyListMap = verifyList.parallelStream().collect(Collectors.toMap(x -> { return x.get("time").toString(); }, x -> { - return (long) x.get("total"); + return (String) x.get("total"); })); successMap.putAll(successListMap); @@ -1768,10 +1768,10 @@ public class WxChartServiceImpl implements WxChartDataService { return vo; } - public static Map getDateMap(Date begin, Date end) { + public static Map getDateMap(Date begin, Date end) { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - Map map = new LinkedHashMap<>(); - map.put(format.format(begin), 0L); + Map map = new LinkedHashMap<>(); + map.put(format.format(begin), "0"); Calendar calBegin = Calendar.getInstance(); calBegin.setTime(begin); Calendar calEnd = Calendar.getInstance(); @@ -1780,7 +1780,7 @@ public class WxChartServiceImpl implements WxChartDataService { end = calEnd.getTime(); while (calBegin.getTime().before(end)) { calBegin.add(Calendar.DAY_OF_MONTH, 1); - map.put(format.format(calBegin.getTime()), 0L); + map.put(format.format(calBegin.getTime()), "0"); } return map; } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index cd82d5ae3..5a73c826e 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -680,7 +680,7 @@