|
@@ -6,6 +6,7 @@ import cn.newfeifan.mall.module.distri.dal.dataobject.consumptionchangelog.Consu
|
|
import cn.newfeifan.mall.module.distri.dal.dataobject.consumptiontopuplog.ConsumptionTopUpLogDO;
|
|
import cn.newfeifan.mall.module.distri.dal.dataobject.consumptiontopuplog.ConsumptionTopUpLogDO;
|
|
import cn.newfeifan.mall.module.distri.dal.dataobject.consumptiontransferlog.ConsumptionTransferLogDO;
|
|
import cn.newfeifan.mall.module.distri.dal.dataobject.consumptiontransferlog.ConsumptionTransferLogDO;
|
|
import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
|
|
import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
|
|
|
|
+import cn.newfeifan.mall.module.distri.dal.dataobject.usertopupconsumptionpointsorder.UserTopUpConsumptionPointsOrderDO;
|
|
import cn.newfeifan.mall.module.distri.enums.ConsumptionEnum;
|
|
import cn.newfeifan.mall.module.distri.enums.ConsumptionEnum;
|
|
import cn.newfeifan.mall.module.distri.service.applicationforwithdrawal.ApplicationForWithdrawalService;
|
|
import cn.newfeifan.mall.module.distri.service.applicationforwithdrawal.ApplicationForWithdrawalService;
|
|
import cn.newfeifan.mall.module.distri.service.consumptionchangelog.ConsumptionChangeLogService;
|
|
import cn.newfeifan.mall.module.distri.service.consumptionchangelog.ConsumptionChangeLogService;
|
|
@@ -13,6 +14,7 @@ import cn.newfeifan.mall.module.distri.service.consumptionerroruser.ConsumptionE
|
|
import cn.newfeifan.mall.module.distri.service.consumptiontopuplog.ConsumptionTopUpLogService;
|
|
import cn.newfeifan.mall.module.distri.service.consumptiontopuplog.ConsumptionTopUpLogService;
|
|
import cn.newfeifan.mall.module.distri.service.consumptiontransferlog.ConsumptionTransferLogService;
|
|
import cn.newfeifan.mall.module.distri.service.consumptiontransferlog.ConsumptionTransferLogService;
|
|
import cn.newfeifan.mall.module.distri.service.integral.IntegralService;
|
|
import cn.newfeifan.mall.module.distri.service.integral.IntegralService;
|
|
|
|
+import cn.newfeifan.mall.module.distri.service.usertopupconsumptionpointsorder.UserTopUpConsumptionPointsOrderService;
|
|
import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
|
|
import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
|
|
import cn.newfeifan.mall.module.member.service.user.MemberUserService;
|
|
import cn.newfeifan.mall.module.member.service.user.MemberUserService;
|
|
import cn.newfeifan.mall.module.system.controller.admin.auth.vo.AuthSmsSendReqVO;
|
|
import cn.newfeifan.mall.module.system.controller.admin.auth.vo.AuthSmsSendReqVO;
|
|
@@ -71,6 +73,8 @@ public class ConsumptionErrorLogServiceImpl implements ConsumptionErrorLogServic
|
|
private AdminUserService adminUserService;
|
|
private AdminUserService adminUserService;
|
|
@Resource
|
|
@Resource
|
|
private AdminAuthService authService;
|
|
private AdminAuthService authService;
|
|
|
|
+ @Resource
|
|
|
|
+ private UserTopUpConsumptionPointsOrderService userTopUpConsumptionPointsOrderService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Long createConsumptionErrorLog(ConsumptionErrorLogSaveReqVO createReqVO) {
|
|
public Long createConsumptionErrorLog(ConsumptionErrorLogSaveReqVO createReqVO) {
|
|
@@ -159,6 +163,16 @@ public class ConsumptionErrorLogServiceImpl implements ConsumptionErrorLogServic
|
|
)
|
|
)
|
|
));
|
|
));
|
|
|
|
|
|
|
|
+ Map<Long, Long> topUpMap = userTopUpConsumptionPointsOrderService.getUserTopUpConsumptionPointsOrderList().stream()
|
|
|
|
+ .collect(Collectors.groupingBy(
|
|
|
|
+ UserTopUpConsumptionPointsOrderDO::getUserId, // 按userid分组
|
|
|
|
+ Collectors.reducing(0L, // 初始化累加器
|
|
|
|
+ UserTopUpConsumptionPointsOrderDO::getPracticalConsumptionPoints, // 获取每个对象的consumptionPoints
|
|
|
|
+ Long::sum // 累加函数
|
|
|
|
+ )
|
|
|
|
+ ));
|
|
|
|
+
|
|
|
|
+ // 初始化所有用户消费分
|
|
Map<Long, Long> userTotalMap = integralDOS.stream()
|
|
Map<Long, Long> userTotalMap = integralDOS.stream()
|
|
.collect(Collectors.toMap(
|
|
.collect(Collectors.toMap(
|
|
IntegralDO::getUserId,
|
|
IntegralDO::getUserId,
|
|
@@ -170,6 +184,7 @@ public class ConsumptionErrorLogServiceImpl implements ConsumptionErrorLogServic
|
|
changLogMap.forEach((userId, topUpPoints) -> userTotalMap.merge(userId, topUpPoints, Long::sum));
|
|
changLogMap.forEach((userId, topUpPoints) -> userTotalMap.merge(userId, topUpPoints, Long::sum));
|
|
recipientLogMap.forEach((userId, topUpPoints) -> userTotalMap.merge(userId, topUpPoints, Long::sum));
|
|
recipientLogMap.forEach((userId, topUpPoints) -> userTotalMap.merge(userId, topUpPoints, Long::sum));
|
|
withdrawalMap.forEach((userId, topUpPoints) -> userTotalMap.merge(userId, topUpPoints, Long::sum));
|
|
withdrawalMap.forEach((userId, topUpPoints) -> userTotalMap.merge(userId, topUpPoints, Long::sum));
|
|
|
|
+ topUpMap.forEach((userId, topUpPoints) -> userTotalMap.merge(userId, topUpPoints, Long::sum));
|
|
|
|
|
|
// 用户可用消费分
|
|
// 用户可用消费分
|
|
Map<Long, Long> currentMap = integralDOS.stream()
|
|
Map<Long, Long> currentMap = integralDOS.stream()
|