From 75982a0429d53bf141293614450ef4594ec8a492 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 23 Apr 2019 13:31:24 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A1=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxChartDataController.java | 8 +++++++- .../iformall/service/impl/WxTopicServiceImpl.java | 15 ++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java index c9618b61f..6ab58acab 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java @@ -40,7 +40,13 @@ public class WxChartDataController extends BaseController { "--------------------------------------"+ "chart=50费用收缴数据:" + "ysje 应收金额 ssje 实收金额 zjsjl收缴率 rent*租赁收缴率 property*物业收缴率 deposit*押金收缴率 other*其他费用收缴率" + - "rentOwe 租赁总额 propertyOwe物业总额 otherOwe其他总额 depositOwe押金总额 totalOwe欠缴总额") + "rentOwe 租赁总额 propertyOwe物业总额 otherOwe其他总额 depositOwe押金总额 totalOwe欠缴总额"+ + "--------------------------------------"+ + "chart=52营销数据:" + + "当前”券交易数据“替换为”营销数据“:cardHistory卡营销历史 pressSendHistory砍价营销历史 groupHistory拼团营销历史 couponHistory卷营销历史," + + "卡、卷、砍价、拼团走势以及右边的数据总览,对应原来 营销系统->卡、卷、砍价、拼团营销数据" + + "场景发券:" + ) @GetMapping("/queryData") @ApiImplicitParams({ @ApiImplicitParam(name = "chart", value = "chart", dataType = "String", paramType = "query", required = true), diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index 3b8d3fa27..c78e6174c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -122,7 +122,20 @@ public class WxTopicServiceImpl implements WxTopicService { @Override public WxTopic findById(WxTopic record) { WxTopic wxTopic = wxTopicMapper.selectByPrimaryKey(record.getId()); - wxTopic.setCouponList(wxCouponMapper.findCouponByTopic(record)); + List wxCouponList = wxCouponMapper.findCouponByTopic(record); + wxTopic.setCouponList(wxCouponList); + String couponIds = ""; + if(CollectionUtils.isNotEmpty(wxCouponList)) { + for (int i = 0; i < wxCouponList.size(); i++) { + WxCoupon wxCoupon = wxCouponList.get(i); + if (i == wxCouponList.size() - 1) { + couponIds += wxCoupon.getId().toString(); + } else { + couponIds += wxCoupon.getId().toString() + ","; + } + } + wxTopic.setCouponIds(couponIds); + } return wxTopic; } }