diff --git a/fw-morax-dao/src/main/resources/mapper/eval/EvalGroupRewardHitLogMapper.xml b/fw-morax-dao/src/main/resources/mapper/eval/EvalGroupRewardHitLogMapper.xml index bbf8854..b305acf 100644 --- a/fw-morax-dao/src/main/resources/mapper/eval/EvalGroupRewardHitLogMapper.xml +++ b/fw-morax-dao/src/main/resources/mapper/eval/EvalGroupRewardHitLogMapper.xml @@ -15,7 +15,7 @@ t1.proportion_value, t1.data_date, t1.group_id, - t2.name + t2.user_name as name FROM eval_group_reward_hit_log t1 LEFT JOIN eval_user_pool t2 ON t1.pool_id = t2.id @@ -38,10 +38,10 @@ t1.proportion_value, t1.data_date, t1.group_id, - t2.name + t2.shop_name as name FROM eval_group_reward_hit_log t1 - LEFT JOIN eval_user_pool t2 ON t1.pool_id = t2.id + LEFT JOIN eval_shop_pool t2 ON t1.pool_id = t2.id WHERE t1.eval_group_reward_id = #{evalGroupRewardId} AND t1.data_date = #{dataDate} diff --git a/fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalGroupRewardHitLogVO.java b/fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalGroupRewardHitLogVO.java index e761393..2825ec6 100644 --- a/fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalGroupRewardHitLogVO.java +++ b/fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalGroupRewardHitLogVO.java @@ -78,8 +78,11 @@ public class EvalGroupRewardHitLogVO { /** * 转换为百分数展示 */ - public void convertValueToPercent(){ + public void convertValueToPercent(DataTypeEnum laddersType){ this.setProportionValue(this.getProportionValue().multiply(Constant.ONE_HUNDRED)); +// if (DataTypeEnum.RATIO.equals(laddersType)) { +// this.setHitCommissionValue(this.getHitCommissionValue().multiply(Constant.ONE_HUNDRED)); +// } } diff --git a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupPoolService.java b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupPoolService.java index 9079b1e..84b0e7a 100644 --- a/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupPoolService.java +++ b/fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupPoolService.java @@ -1257,13 +1257,15 @@ public class EvalGroupPoolService { } public List queryRewardProportion(EvalScopeEnum scopeType, Long evalGroupRewardId, LocalDate dataDate) { + EvalGroupReward reward = evalGroupRewardService.getById(evalGroupRewardId); + BV.notNull(reward, "奖惩不存在"); List hitLogVOS = null; if (EvalScopeEnum.STAFF.equals(scopeType)) { hitLogVOS = evalGroupRewardHitLogService.getUserHitLogs(evalGroupRewardId, dataDate); } else { hitLogVOS = evalGroupRewardHitLogService.getShopHitLogs(evalGroupRewardId, dataDate); } - hitLogVOS.stream().forEach(hitLog -> hitLog.convertValueToPercent()); + hitLogVOS.stream().forEach(hitLog -> hitLog.convertValueToPercent(reward.getLaddersType())); return hitLogVOS; } }