feature(*): 修改排名展示

修改排名展示

feature(*): 修改排名展示
修改排名展示
姜超
1 parent 224ee28b
Showing 3 changed files with 10 additions and 5 deletions
fw-morax-dao/src/main/resources/mapper/eval/EvalGroupRewardHitLogMapper.xml
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalGroupRewardHitLogVO.java
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupPoolService.java
@@ -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}
@@ -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));
+//        }
     }
@@ -1257,13 +1257,15 @@ public class EvalGroupPoolService {
     }
     public List<EvalGroupRewardHitLogVO> queryRewardProportion(EvalScopeEnum scopeType, Long evalGroupRewardId, LocalDate dataDate) {
+        EvalGroupReward reward = evalGroupRewardService.getById(evalGroupRewardId);
+        BV.notNull(reward, "奖惩不存在");
         List<EvalGroupRewardHitLogVO> 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;
     }
 }