YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by mingdan.ge
Commit 247d5659a6a90983af935278184426e0025b6ac3 1 parent 14575997

cps

Inline Side-by-side
Showing 2 changed files with 7 additions and 14 deletions
@@ -8,7 +8,7 @@ import org.slf4j.helpers.MessageFormatter; @@ -8,7 +8,7 @@ import org.slf4j.helpers.MessageFormatter;
8 public enum ShareOrdersKeyEnum { 8 public enum ShareOrdersKeyEnum {
9 9
10 ORDER_LIST("yh:union:share:orderList:","type:{}:tab:{}:status:{}:page:{}:limit:{}",600,"订单列表"), 10 ORDER_LIST("yh:union:share:orderList:","type:{}:tab:{}:status:{}:page:{}:limit:{}",600,"订单列表"),
11 - ESTIMATE_LIST("yh:union:share:estimateList:","type:{}:timeType:{}:page:{}:limit:{}",600,"预估收益详细列表"), 11 + ESTIMATE_LIST("yh:union:share:estimateList:","type:{}:timeType:{}:page:{}:limit:{}",60,"预估收益详细列表"),
12 INVITE_LIST("yh:union:share:inviteList:","page:{}:limit:{}",600,"拉新注册有赚列表"), 12 INVITE_LIST("yh:union:share:inviteList:","page:{}:limit:{}",600,"拉新注册有赚列表"),
13 ORDER_INFO("yh:union:share:orderInfo:","key:{}:orderCode:{}",600,"订单详情"), 13 ORDER_INFO("yh:union:share:orderInfo:","key:{}:orderCode:{}",600,"订单详情"),
14 ACTIVITY_ORDER("yh:union:share:activityOrder:","key:{}",600,"订单详情"), 14 ACTIVITY_ORDER("yh:union:share:activityOrder:","key:{}",600,"订单详情"),
@@ -677,7 +677,6 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport @@ -677,7 +677,6 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
677 if (unionShareUserInvite == null) { 677 if (unionShareUserInvite == null) {
678 updateObj.setInviterUid(inviterUid); 678 updateObj.setInviterUid(inviterUid);
679 updateObj.setUid(unionShareUser.getUid()); 679 updateObj.setUid(unionShareUser.getUid());
680 -// updateObj.setDate(Integer.valueOf(DateUtil.getDateStrBySecond(unionShareUser.getCreateTime(), "yyyyMMdd")));  
681 updateObj.setDate(unionShareUser.getCreateTime()); 680 updateObj.setDate(unionShareUser.getCreateTime());
682 updateObj.setCreateTime(DateUtil.getCurrentTimeSecond()); 681 updateObj.setCreateTime(DateUtil.getCurrentTimeSecond());
683 updateObj.setUpdateTime(updateObj.getCreateTime()); 682 updateObj.setUpdateTime(updateObj.getCreateTime());
@@ -1525,11 +1524,11 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport @@ -1525,11 +1524,11 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
1525 public PageResponseBO<UnionShareOrders> queryEstimateDetailList(UnionShareOrderReqBO unionShareOrderReqBO) { 1524 public PageResponseBO<UnionShareOrders> queryEstimateDetailList(UnionShareOrderReqBO unionShareOrderReqBO) {
1526 logger.info("UnionShareServiceImpl.queryEstimateDetailList,bo is {}",unionShareOrderReqBO); 1525 logger.info("UnionShareServiceImpl.queryEstimateDetailList,bo is {}",unionShareOrderReqBO);
1527 //先从缓存获取 1526 //先从缓存获取
1528 -// PageResponseBO<UnionShareOrders> cacheResult = getFromRedis(ShareOrdersKeyEnum.ESTIMATE_LIST, unionShareOrderReqBO.getUid(),PageResponseBO.class,unionShareOrderReqBO.getType().toString(),unionShareOrderReqBO.getQueryTimeType().toString(), String.valueOf(unionShareOrderReqBO.getPage()), String.valueOf(unionShareOrderReqBO.getSize()));  
1529 -// if (cacheResult != null) {  
1530 -// logger.info("UnionShareServiceImpl.queryEstimateDetailList get redis cache ,uid is {},cacheResult is {}",unionShareOrderReqBO.getUid(),cacheResult);  
1531 -// return cacheResult;  
1532 -// } 1527 + PageResponseBO<UnionShareOrders> cacheResult = getFromRedis(ShareOrdersKeyEnum.ESTIMATE_LIST, unionShareOrderReqBO.getUid(),PageResponseBO.class,unionShareOrderReqBO.getType().toString(),unionShareOrderReqBO.getQueryTimeType().toString(), String.valueOf(unionShareOrderReqBO.getPage()), String.valueOf(unionShareOrderReqBO.getSize()));
  1528 + if (cacheResult != null) {
  1529 + logger.info("UnionShareServiceImpl.queryEstimateDetailList get redis cache ,uid is {},cacheResult is {}",unionShareOrderReqBO.getUid(),cacheResult);
  1530 + return cacheResult;
  1531 + }
1533 //获取总数 1532 //获取总数
1534 PageResponseBO<UnionShareOrders> response = new PageResponseBO<>(); 1533 PageResponseBO<UnionShareOrders> response = new PageResponseBO<>();
1535 1534
@@ -1951,11 +1950,6 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport @@ -1951,11 +1950,6 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
1951 joinResult = joinNewCpsActivity(activityLog.getPromoteUid(), orders, activityLog.getActivityId()); 1950 joinResult = joinNewCpsActivity(activityLog.getPromoteUid(), orders, activityLog.getActivityId());
1952 } 1951 }
1953 1952
1954 - if (!joinResult) {  
1955 - //已不满足此活动条件  
1956 - // clearOrderRelated(orderCodeList);  
1957 - }  
1958 - //todo 清缓存  
1959 return joinResult; 1953 return joinResult;
1960 } 1954 }
1961 1955
@@ -2236,7 +2230,6 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport @@ -2236,7 +2230,6 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
2236 return true; 2230 return true;
2237 } 2231 }
2238 2232
2239 - //TODO 测试  
2240 //是否满足活动条件 2233 //是否满足活动条件
2241 if (!canJoinActivity(promoteUid, activityId)) { 2234 if (!canJoinActivity(promoteUid, activityId)) {
2242 //不满足活动条件 2235 //不满足活动条件
@@ -2475,7 +2468,6 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport @@ -2475,7 +2468,6 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
2475 //额外返在活动结束后走定时任务 2468 //额外返在活动结束后走定时任务
2476 return false; 2469 return false;
2477 } 2470 }
2478 - //todo 测试  
2479 //是否满足活动条件 2471 //是否满足活动条件
2480 if (!canJoinActivity(order.getPromoteUid(), activity.getId())) { 2472 if (!canJoinActivity(order.getPromoteUid(), activity.getId())) {
2481 //不满足活动条件 2473 //不满足活动条件
@@ -3249,6 +3241,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport @@ -3249,6 +3241,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
3249 }); 3241 });
3250 redisHashCache.delete(ShareOrdersKeyEnum.RANK_INFO.getPreKey(),promoteUid); 3242 redisHashCache.delete(ShareOrdersKeyEnum.RANK_INFO.getPreKey(),promoteUid);
3251 redisHashCache.delete(ShareOrdersKeyEnum.ORDER_STATISTICS_INFO.getPreKey(),promoteUid); 3243 redisHashCache.delete(ShareOrdersKeyEnum.ORDER_STATISTICS_INFO.getPreKey(),promoteUid);
  3244 + redisHashCache.delete(ShareOrdersKeyEnum.ESTIMATE_LIST.getPreKey(),promoteUid);
3252 } 3245 }
3253 3246
3254 private void updateOneMonthData(int promoteUid, String date){ 3247 private void updateOneMonthData(int promoteUid, String date){