diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java index ab3c95e73..c784e9d1f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java @@ -43,8 +43,20 @@ public class WxChartDataController extends BaseController { "chart=51首页场景发卷:" + "carStopHistory停车发卷 couponVerifyHistory核销发卷 orderHistory交易发卷 micropayHistory收银台发卷"+ "--------------------------------------" + - "触达用户=数据总览的活跃用户数据" - + "触达用户=数据总览的活跃用户数据"+ + "--------------------------------------" + + "chart=46 卷营销数据:" + + "orderCountList卷购买数量历史 paymentCountList卷核销数量 priceCouponSaleCountList有价卷销售数量历史 " + + "priceCouponPaymentCountList有价卷核销数量历史 sumPriceSaleMoney有价券销售总额 sumPricePayMent有价卷核销总额 " + + "sumSubsidyMoney商场补贴金额 priceCouponCancelCount有价卷退款数量 priceCouponSaleCountListTotal有价券售出数量"+ + "--------------------------------------" + + "chart=45 卡营销数据:" + + "saleHistory销售金额历史 paymentHistory核销历史 saleCardCount售出卡数量 tranCount转增数量 subsidyCount补贴金额"+ + "--------------------------------------" + + "chart=47 砍价营销数据:" + + "pressSendHistory砍价发起历史 pressSuccHistory砍价成功历史 pressPaymentHistory砍价核销历史 " + + "pressSendHistoryTotal发起总数 pressSuccHistoryCount成功总数 pressPaymentHistoryCount核销总数 pressSuccRate成功率 sumJoin参与人数" + "--------------------------------------" ) @GetMapping("/queryData") @ApiImplicitParams({ diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index 611ea7ea6..29b423553 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -145,6 +145,11 @@ public interface WxCouponService { */ Long priceCouponCancelCount(WxCoupon wxCoupon); + /** + * 有价券销售总额 + * @param wxCoupon + * @return + */ String findSumPriceSaleMoney(WxCoupon wxCoupon); String findSumPricePayMent(WxCoupon wxCoupon); String findSumSubsidyMoney(WxCoupon wxCoupon); 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 16ad66279..c813c3327 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -1914,7 +1914,14 @@ public class WxChartServiceImpl implements WxChartDataService { result.put("sumPriceSaleMoney",wxCouponService.findSumPriceSaleMoney(wxCoupon)); result.put("sumPricePayMent",wxCouponService.findSumPricePayMent(wxCoupon)); result.put("sumSubsidyMoney",wxCouponService.findSumSubsidyMoney(wxCoupon)); - result.put("priceCouponCancelCount",priceCouponCancelCount); + result.put("priceCouponCancelCount",priceCouponCancelCount);//有价卷退款数量 + + //有价券售出数量 + int total = 0; + for (WxCouponStatisVo couponStatisVo:priceCouponSaleCountList) { + total += Integer.parseInt(couponStatisVo.getXcount()); + } + result.put("priceCouponSaleCountListTotal",total); return new ResultData(result); }