diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java index c78402761..67cd22d73 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java @@ -144,39 +144,39 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl resultmap = BeanUtil.beanToMap(recordPage); - List recordCountVO = getMapper().countRecordBySource(mkShopCouponRecordDTO.getCouponId(), mkShopCouponRecordDTO.getUserId(), - mkShopCouponRecordDTO.getStatus(), mkShopCouponRecordDTO.getSource(), startTime, endTime); - Map tempMap = recordCountVO.stream() - .collect(Collectors.toMap( - CouponRecordCountVO::getSourceType, - CouponRecordCountVO::getCount, - (existing, _) -> existing - )); - Map categoryMap = TARGET_KEY.stream() - .collect(Collectors.toMap( - key -> key, - key -> tempMap.getOrDefault(key, 0L) - )); - resultmap.put("categoryMap", categoryMap); - Map resultCountMap = new HashMap<>(); - resultCountMap.put("用户领取", 0L); - resultCountMap.put("推广发放", 0L); - resultCountMap.put("管理员赠送", 0L); - resultCountMap.put("系统发送", 0L); - - if (CollUtil.isNotEmpty(recordCountVO)) { - for (CouponRecordCountVO record : recordCountVO) { - String sourceName = record.getSourceType(); - Long count = record.getCount(); - - String category = SOURCE_TO_CATEGORY.get(sourceName); - if (category != null) { - resultCountMap.put(category, resultCountMap.get(category) + count); - } - } - } - resultmap.put("categoryMap", categoryMap); - resultmap.put("resultCountMap", resultCountMap); +// List recordCountVO = getMapper().countRecordBySource(mkShopCouponRecordDTO.getCouponId(), mkShopCouponRecordDTO.getUserId(), +// mkShopCouponRecordDTO.getStatus(), mkShopCouponRecordDTO.getSource(), startTime, endTime); +// Map tempMap = recordCountVO.stream() +// .collect(Collectors.toMap( +// CouponRecordCountVO::getSourceType, +// CouponRecordCountVO::getCount, +// (existing, _) -> existing +// )); +// Map categoryMap = TARGET_KEY.stream() +// .collect(Collectors.toMap( +// key -> key, +// key -> tempMap.getOrDefault(key, 0L) +// )); +// resultmap.put("categoryMap", categoryMap); +// Map resultCountMap = new HashMap<>(); +// resultCountMap.put("用户领取", 0L); +// resultCountMap.put("推广发放", 0L); +// resultCountMap.put("管理员赠送", 0L); +// resultCountMap.put("系统发送", 0L); +// +// if (CollUtil.isNotEmpty(recordCountVO)) { +// for (CouponRecordCountVO record : recordCountVO) { +// String sourceName = record.getSourceType(); +// Long count = record.getCount(); +// +// String category = SOURCE_TO_CATEGORY.get(sourceName); +// if (category != null) { +// resultCountMap.put(category, resultCountMap.get(category) + count); +// } +// } +// } +// resultmap.put("categoryMap", categoryMap); +// resultmap.put("resultCountMap", resultCountMap); return resultmap; }