记得上下班打卡 | git大法好,push需谨慎

Commit cae170ad authored by 胡佳晨's avatar 胡佳晨

增加 如果限购类型是指定用户 并且 白名单文件是空 则 类型为 -1

判断用户是否可购买逻辑
getListCanBuy 增加判断 如果状态是-1 则全部用户可购买
parent 3761b0f1
...@@ -215,6 +215,9 @@ public class GoblinListServiceImpl implements IGoblinListService { ...@@ -215,6 +215,9 @@ public class GoblinListServiceImpl implements IGoblinListService {
collectVo.setPriceV(itemVo.getPriceV()); collectVo.setPriceV(itemVo.getPriceV());
collectVo.setProductId(itemVo.getProductId()); collectVo.setProductId(itemVo.getProductId());
collectVo.setWhiteType(vo.getWhiteType()); collectVo.setWhiteType(vo.getWhiteType());
if(vo.getWhiteType().equals(1) && vo.getWhiteUrl().equals("")){
collectVo.setWhiteType(-1);
}
collectVo.setTimeStart(st); collectVo.setTimeStart(st);
collectVo.setTimeEnd(et); collectVo.setTimeEnd(et);
collectVo.setTagType(vo.getTagType()); collectVo.setTagType(vo.getTagType());
...@@ -274,6 +277,9 @@ public class GoblinListServiceImpl implements IGoblinListService { ...@@ -274,6 +277,9 @@ public class GoblinListServiceImpl implements IGoblinListService {
for (GoblinListCollectVo itemVo : collectVos) { for (GoblinListCollectVo itemVo : collectVos) {
if (itemVo.getListId().equals(param.getListId())) { if (itemVo.getListId().equals(param.getListId())) {
itemVo.setWhiteType(vo.getWhiteType()); itemVo.setWhiteType(vo.getWhiteType());
if(vo.getWhiteType().equals(1) && vo.getWhiteUrl().equals("")){
itemVo.setWhiteType(-1);
}
break; break;
} }
} }
......
...@@ -1043,7 +1043,9 @@ public class GoblinRedisUtils { ...@@ -1043,7 +1043,9 @@ public class GoblinRedisUtils {
if (bResult) { if (bResult) {
return false; return false;
} }
if (whiteType == 0) {//会员 if (whiteType == -1) {
return true;
}else if (whiteType == 0) {//会员
return memberStage != null; return memberStage != null;
} else {//白名单 } else {//白名单
return wResult; return wResult;
......
...@@ -316,7 +316,9 @@ public class GoblinRedisUtils { ...@@ -316,7 +316,9 @@ public class GoblinRedisUtils {
if (bResult) { if (bResult) {
return false; return false;
} }
if (whiteType == 0) {//会员 if (whiteType == -1) {
return true;
}else if (whiteType == 0) {//会员
return memberStage != null; return memberStage != null;
} else {//白名单 } else {//白名单
return wResult; return wResult;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment