Commit 41674338 by zhangxingmin

push

parent 3d7881f7
...@@ -264,6 +264,8 @@ public class ApiExpectedFortuneAsyncService { ...@@ -264,6 +264,8 @@ public class ApiExpectedFortuneAsyncService {
*/ */
public void updateAgentAccumulatedFyc(List<AgentAccumulatedFyc> accumulatedFycList, public void updateAgentAccumulatedFyc(List<AgentAccumulatedFyc> accumulatedFycList,
List<AlgorithmCollectResDto> filteredCollectResDtos) { List<AlgorithmCollectResDto> filteredCollectResDtos) {
log.info("更新积分总表的值=>accumulatedFycList入参:{}",JSON.toJSONString(accumulatedFycList));
log.info("更新积分总表的值=>filteredCollectResDtos入参:{}",JSON.toJSONString(filteredCollectResDtos));
//更新积分总表的值,更新这个accumulatedFycList的每个对象里面的:未生效累计积分(不限业务场景)、累计积分 = 未生效累计积分 + 已生效累计积分、未生效累计首期佣金积分值(佣金场景)、未生效累计非首期佣金积分值(佣金场景) //更新积分总表的值,更新这个accumulatedFycList的每个对象里面的:未生效累计积分(不限业务场景)、累计积分 = 未生效累计积分 + 已生效累计积分、未生效累计首期佣金积分值(佣金场景)、未生效累计非首期佣金积分值(佣金场景)
// 将查询到的累计积分列表转为 Map(便于更新) // 将查询到的累计积分列表转为 Map(便于更新)
Map<String, AgentAccumulatedFyc> fycMap = accumulatedFycList.stream() Map<String, AgentAccumulatedFyc> fycMap = accumulatedFycList.stream()
...@@ -272,6 +274,7 @@ public class ApiExpectedFortuneAsyncService { ...@@ -272,6 +274,7 @@ public class ApiExpectedFortuneAsyncService {
Function.identity(), Function.identity(),
(v1, v2) -> v1 (v1, v2) -> v1
)); ));
log.info("将查询到的累计积分列表转为 Map=>fycMap:{}",JSON.toJSONString(fycMap));
// 构建每个转介人本次的积分增量 Map // 构建每个转介人本次的积分增量 Map
// 未生效个人累计积分增量(定时(冻结)) // 未生效个人累计积分增量(定时(冻结))
...@@ -333,6 +336,14 @@ public class ApiExpectedFortuneAsyncService { ...@@ -333,6 +336,14 @@ public class ApiExpectedFortuneAsyncService {
} }
} }
} }
log.info("收集去重的转介人业务ID=>hashSet:{}",JSON.toJSONString(hashSet));
log.info("未生效个人累计积分增量(定时(冻结))=>noDeltaMap:{}",JSON.toJSONString(noDeltaMap));
log.info("未生效首期佣金增量(定时(冻结))=>noFirstCommissionDeltaMap:{}",JSON.toJSONString(noFirstCommissionDeltaMap));
log.info("未生效非首期佣金增量(定时(冻结))=>noRycDeltaMap:{}",JSON.toJSONString(noRycDeltaMap));
log.info("已生效个人累计积分增量(非定时(生效))=>deltaMap:{}",JSON.toJSONString(deltaMap));
log.info("已生效首期佣金增量(非定时(生效))=>firstCommissionDeltaMap:{}",JSON.toJSONString(firstCommissionDeltaMap));
log.info("已生效非首期佣金增量(非定时(生效))=>rycDeltaMap:{}",JSON.toJSONString(rycDeltaMap));
// 更新或新建累计积分记录 // 更新或新建累计积分记录
List<AgentAccumulatedFyc> toUpdateList = new ArrayList<>(); List<AgentAccumulatedFyc> toUpdateList = new ArrayList<>();
...@@ -381,6 +392,8 @@ public class ApiExpectedFortuneAsyncService { ...@@ -381,6 +392,8 @@ public class ApiExpectedFortuneAsyncService {
toUpdateList.add(fyc); toUpdateList.add(fyc);
} }
log.info("更新或新建累计积分记录=>toUpdateList:{}",JSON.toJSONString(toUpdateList));
// 批量保存 // 批量保存
if (CollectionUtils.isNotEmpty(toUpdateList)) { if (CollectionUtils.isNotEmpty(toUpdateList)) {
iAgentAccumulatedFycService.saveOrUpdateBatch(toUpdateList); iAgentAccumulatedFycService.saveOrUpdateBatch(toUpdateList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment