达人排行榜

@@ -17,7 +17,7 @@ public enum ShareOrdersKeyEnum {
     ACTIVITY_ING_LIST("yh:union:share:activity:ing:list",null,120,"进行中的活动"),
     ACTIVITY("yh:union:share:activity:","type:{}:id:{}",120,"活动"),
 	ORDER_STATISTICS_INFO("yh:union:share:statisticsInfo:","uid:{}:queryTimeType:{}",600,"统计数据"),
-    RANK_LIST("yh:union:share:ranklist:","type:{}:start:{}:limit:{}",600,"达人排行榜"),
+    RANK_LIST("yh:union:share:ranklist:","type:{}:start:{}:limit:{}",86400,"达人排行榜"),
     RANK_INFO("yh:union:share:rank:","date:{}:type:{}",300,"个人排行");
 
 

@@ -56,7 +56,7 @@ public class UnionShareOrderConsumer implements YhConsumer {
             logger.info("UnionShareOrderConsumer,begin to updateMonthData,uids is {},o is {}",uids, o);
             //更新dates月用户月收益数据
             uids.forEach((u,dates)->{
-                //todo 更新uid月预估收益，里面是否需要校验一下log表和order表
+                //更新uid月预估收益，里面是否需要校验一下log表和order表
                 try {
                     unionShareService.updateMonthData(u,dates);
                 } catch (Exception e) {
@@ -65,7 +65,7 @@ public class UnionShareOrderConsumer implements YhConsumer {
             });
             logger.info("UnionShareOrderConsumer,updateMonthData end,uids is {},o is {}",uids, o);
             //清达人相关redis
-            int date = Integer.valueOf(com.yoho.unions.common.utils.DateUtil.getToday("yyyyMMdd"));
+            int date = Integer.valueOf(DateUtil.getToday("yyyyMMdd"));
             redisHashCache.delete(ShareOrdersKeyEnum.RANK_LIST.getPreKey(),date);
         } catch (Exception e) {
             logger.warn("UnionShareOrderConsumer,handleMessage fail! obj is {}, e {}",o,e.getMessage());

@@ -1236,7 +1236,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
             }
         }
         rankInfo = new UninoShareIncomeBo();
-        BigDecimal amount = unionShareOrdersMonthMapper.selectAmountByUid(date/100, uid, 1);//类型：1-联盟用户，2-马甲用户
+        BigDecimal amount = unionShareOrdersMonthMapper.selectAmountByUid(type==1?date/100:null, uid, 1);//类型：1-联盟用户，2-马甲用户
         if (amount == null) {
             amount = new BigDecimal(0);
         }
@@ -1603,7 +1603,6 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
         if (num != null) {
             return num;
         }
-        //todo  读写缓存
         num = unionShareOrdersActivityItemMapper.selectMinNumByActivityId(activityId);
         if (num == null) {
             //不该出现此情况
@@ -1616,7 +1615,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
 
     @Override
     public void clearActivityCache(int activityId) {
-        //todo 清除某活动缓存
+        // 清除某活动缓存
         redisTemplate.delete(ShareOrdersKeyEnum.ACTIVITY_ING_LIST.getPreKey());
         redisHashCache.delete(ShareOrdersKeyEnum.ACTIVITY.getPreKey(),activityId);
     }