Просмотр исходного кода

[首页统计][修改][添加首页统计项]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
75982a0429
2 измененных файлов: 21 добавлений и 2 удалений
  1. +7
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java
  2. +14
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java

+ 7
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java Просмотреть файл

@@ -40,7 +40,13 @@ public class WxChartDataController extends BaseController {
"--------------------------------------"+ "--------------------------------------"+
"chart=50费用收缴数据:" + "chart=50费用收缴数据:" +
"ysje 应收金额 ssje 实收金额 zjsjl收缴率 rent*租赁收缴率 property*物业收缴率 deposit*押金收缴率 other*其他费用收缴率" + "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") @GetMapping("/queryData")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "chart", value = "chart", dataType = "String", paramType = "query", required = true), @ApiImplicitParam(name = "chart", value = "chart", dataType = "String", paramType = "query", required = true),


+ 14
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java Просмотреть файл

@@ -122,7 +122,20 @@ public class WxTopicServiceImpl implements WxTopicService {
@Override @Override
public WxTopic findById(WxTopic record) { public WxTopic findById(WxTopic record) {
WxTopic wxTopic = wxTopicMapper.selectByPrimaryKey(record.getId()); WxTopic wxTopic = wxTopicMapper.selectByPrimaryKey(record.getId());
wxTopic.setCouponList(wxCouponMapper.findCouponByTopic(record));
List<WxCoupon> 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; return wxTopic;
} }
} }

Загрузка…
Отмена
Сохранить