|
@@ -658,6 +658,29 @@ public class ApiController {
|
|
|
mapOne.put("bankCardNumber", sysU.getBankCardNumber());
|
|
|
mapOne.put("bankPhone", sysU.getBankPhone());
|
|
|
|
|
|
+ // 获取会员已结算信息和和待结算信息
|
|
|
+ List<WmScorePackageStatus> packageStatuses = wmScorePackageStatusService.list(Wrappers.<WmScorePackageStatus>lambdaQuery().eq(WmScorePackageStatus::getUserId, sysU.getUserId()).eq(WmScorePackageStatus::getStatus, "2"));
|
|
|
+
|
|
|
+ List<String> ids = packageStatuses.stream().map(WmScorePackageStatus::getPackageId).collect(Collectors.toList());
|
|
|
+
|
|
|
+
|
|
|
+ int paid = 0 ;
|
|
|
+ int unpaid = 0;
|
|
|
+ if (CollUtil.isNotEmpty(ids)){
|
|
|
+ List<WmScorePackage> packages = wmScorePackageService.listByIds(ids);
|
|
|
+
|
|
|
+ Map<String, Integer> collect = packages.stream().filter(pkg -> "4".equals(pkg.getScorePackageStatus()) || "6".equals(pkg.getScorePackageStatus()))
|
|
|
+ .collect(Collectors.groupingBy(WmScorePackage::getScorePackageStatus))
|
|
|
+ .entrySet().stream()
|
|
|
+ .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().stream().mapToInt(WmScorePackage::getScore).sum()));
|
|
|
+
|
|
|
+ paid = collect.get("6");
|
|
|
+ unpaid = collect.get("4");
|
|
|
+
|
|
|
+ }
|
|
|
+ mapOne.put("paid", paid);
|
|
|
+ mapOne.put("unpaid", unpaid);
|
|
|
+
|
|
|
if (Boolean.TRUE.equals(redisTemplate.hasKey(CacheConstants.USER_NOTICE_KEY + sysU.getUserId()))) {
|
|
|
mapOne.put("notice", true);
|
|
|
}
|