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;
public enum ShareOrdersKeyEnum {
ORDER_LIST("yh:union:share:orderList:","type:{}:tab:{}:status:{}:page:{}:limit:{}",600,"订单列表"),
ESTIMATE_LIST("yh:union:share:estimateList:","type:{}:timeType:{}:page:{}:limit:{}",600,"预估收益详细列表"),
ESTIMATE_LIST("yh:union:share:estimateList:","type:{}:timeType:{}:page:{}:limit:{}",60,"预估收益详细列表"),
INVITE_LIST("yh:union:share:inviteList:","page:{}:limit:{}",600,"拉新注册有赚列表"),
ORDER_INFO("yh:union:share:orderInfo:","key:{}:orderCode:{}",600,"订单详情"),
ACTIVITY_ORDER("yh:union:share:activityOrder:","key:{}",600,"订单详情"),
... ...
... ... @@ -677,7 +677,6 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
if (unionShareUserInvite == null) {
updateObj.setInviterUid(inviterUid);
updateObj.setUid(unionShareUser.getUid());
// updateObj.setDate(Integer.valueOf(DateUtil.getDateStrBySecond(unionShareUser.getCreateTime(), "yyyyMMdd")));
updateObj.setDate(unionShareUser.getCreateTime());
updateObj.setCreateTime(DateUtil.getCurrentTimeSecond());
updateObj.setUpdateTime(updateObj.getCreateTime());
... ... @@ -1525,11 +1524,11 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
public PageResponseBO<UnionShareOrders> queryEstimateDetailList(UnionShareOrderReqBO unionShareOrderReqBO) {
logger.info("UnionShareServiceImpl.queryEstimateDetailList,bo is {}",unionShareOrderReqBO);
//先从缓存获取
// 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()));
// if (cacheResult != null) {
// logger.info("UnionShareServiceImpl.queryEstimateDetailList get redis cache ,uid is {},cacheResult is {}",unionShareOrderReqBO.getUid(),cacheResult);
// return cacheResult;
// }
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()));
if (cacheResult != null) {
logger.info("UnionShareServiceImpl.queryEstimateDetailList get redis cache ,uid is {},cacheResult is {}",unionShareOrderReqBO.getUid(),cacheResult);
return cacheResult;
}
//获取总数
PageResponseBO<UnionShareOrders> response = new PageResponseBO<>();
... ... @@ -1951,11 +1950,6 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
joinResult = joinNewCpsActivity(activityLog.getPromoteUid(), orders, activityLog.getActivityId());
}
if (!joinResult) {
//已不满足此活动条件
// clearOrderRelated(orderCodeList);
}
//todo 清缓存
return joinResult;
}
... ... @@ -2236,7 +2230,6 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
return true;
}
//TODO 测试
//是否满足活动条件
if (!canJoinActivity(promoteUid, activityId)) {
//不满足活动条件
... ... @@ -2475,7 +2468,6 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
//额外返在活动结束后走定时任务
return false;
}
//todo 测试
//是否满足活动条件
if (!canJoinActivity(order.getPromoteUid(), activity.getId())) {
//不满足活动条件
... ... @@ -3249,6 +3241,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
});
redisHashCache.delete(ShareOrdersKeyEnum.RANK_INFO.getPreKey(),promoteUid);
redisHashCache.delete(ShareOrdersKeyEnum.ORDER_STATISTICS_INFO.getPreKey(),promoteUid);
redisHashCache.delete(ShareOrdersKeyEnum.ESTIMATE_LIST.getPreKey(),promoteUid);
}
private void updateOneMonthData(int promoteUid, String date){
... ...