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

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

修改 黑白名单方法

修改 消费 逻辑
parent c26e6c10
...@@ -94,30 +94,30 @@ public abstract class AbstractXlsRedisReceiver implements StreamListener<String, ...@@ -94,30 +94,30 @@ public abstract class AbstractXlsRedisReceiver implements StreamListener<String,
objs.add(new Object[]{skuId, xlsPath, type, 1, LocalDateTime.now()}); objs.add(new Object[]{skuId, xlsPath, type, 1, LocalDateTime.now()});
aBoolean = baseDao.batchSql(SQL_INSERT_GOODS_BUY_ROSTER_LOG, objs); aBoolean = baseDao.batchSql(SQL_INSERT_GOODS_BUY_ROSTER_LOG, objs);
} else if (finalType.equals(3) || finalType.equals(4)) { } else if (finalType.equals(3) || finalType.equals(4)) {
if (xlsPath != null && !xlsPath.equals("")) {//添加 if (oXlsPath != null&& !oXlsPath.equals("")) {//删除旧的黑白名单
EasyExcel.read(new URL(xlsPath).openStream(), new PageReadListener<HashMap<String, String>>(dataList -> { EasyExcel.read(new URL(oXlsPath).openStream(), new PageReadListener<HashMap<String, String>>(dataList -> {
for (HashMap<String, String> data : dataList) { for (HashMap<String, String> data : dataList) {
if (data.get(0) == null) { if (data.get(0) == null) {
continue; continue;
} }
if (finalType.equals(3)) { if (finalType.equals(3)) {
redisUtil.set(GoblinRedisConst.REDIS_WHITE.concat(listId+":").concat(finalSkuId + ":").concat(data.get(0)), 1); redisUtil.del(GoblinRedisConst.REDIS_WHITE.concat(listId+":").concat(finalSkuId + ":").concat(data.get(0)));
} else { } else {
redisUtil.set(GoblinRedisConst.REDIS_BLACK.concat(listId+":").concat(finalSkuId + ":").concat(data.get(0)), 1); redisUtil.del(GoblinRedisConst.REDIS_BLACK.concat(listId+":").concat(finalSkuId + ":").concat(data.get(0)));
} }
} }
})).sheet().doRead(); })).sheet().doRead();
} }
if (oXlsPath != null&& !oXlsPath.equals("")) {//删除旧的黑白名单 if (xlsPath != null && !xlsPath.equals("")) {//添加
EasyExcel.read(new URL(oXlsPath).openStream(), new PageReadListener<HashMap<String, String>>(dataList -> { EasyExcel.read(new URL(xlsPath).openStream(), new PageReadListener<HashMap<String, String>>(dataList -> {
for (HashMap<String, String> data : dataList) { for (HashMap<String, String> data : dataList) {
if (data.get(0) == null) { if (data.get(0) == null) {
continue; continue;
} }
if (finalType.equals(3)) { if (finalType.equals(3)) {
redisUtil.del(GoblinRedisConst.REDIS_WHITE.concat(listId+":").concat(finalSkuId + ":").concat(data.get(0))); redisUtil.set(GoblinRedisConst.REDIS_WHITE.concat(listId+":").concat(finalSkuId + ":").concat(data.get(0)), 1);
} else { } else {
redisUtil.del(GoblinRedisConst.REDIS_BLACK.concat(listId+":").concat(finalSkuId + ":").concat(data.get(0))); redisUtil.set(GoblinRedisConst.REDIS_BLACK.concat(listId+":").concat(finalSkuId + ":").concat(data.get(0)), 1);
} }
} }
})).sheet().doRead(); })).sheet().doRead();
......
...@@ -967,8 +967,8 @@ public class GoblinRedisUtils { ...@@ -967,8 +967,8 @@ public class GoblinRedisUtils {
* @return * @return
*/ */
public Boolean getListCanBuy(String listId, String skuId, String mobile, String uid, Integer whiteType) { public Boolean getListCanBuy(String listId, String skuId, String mobile, String uid, Integer whiteType) {
String rdkB = GoblinRedisConst.REDIS_BLACK.concat(listId + ":").concat(skuId + "").concat(mobile); String rdkB = GoblinRedisConst.REDIS_BLACK.concat(listId + ":").concat(skuId + ":").concat(mobile);
String rdkW = GoblinRedisConst.REDIS_WHITE.concat(listId + ":").concat(skuId + "").concat(mobile); String rdkW = GoblinRedisConst.REDIS_WHITE.concat(listId + ":").concat(skuId + ":").concat(mobile);
boolean bResult = redisUtil.hasKey(rdkB);//是否黑名单 boolean bResult = redisUtil.hasKey(rdkB);//是否黑名单
boolean wResult = redisUtil.hasKey(rdkW);//是否白名单 boolean wResult = redisUtil.hasKey(rdkW);//是否白名单
Integer memberStage = getMember(uid); Integer memberStage = getMember(uid);
......
...@@ -352,8 +352,8 @@ public class GoblinRedisUtils { ...@@ -352,8 +352,8 @@ public class GoblinRedisUtils {
* @return * @return
*/ */
public Boolean getListCanBuy(String listId, String skuId, String mobile, String uid, Integer whiteType) { public Boolean getListCanBuy(String listId, String skuId, String mobile, String uid, Integer whiteType) {
String rdkB = GoblinRedisConst.REDIS_BLACK.concat(listId + ":").concat(skuId + "").concat(mobile); String rdkB = GoblinRedisConst.REDIS_BLACK.concat(listId + ":").concat(skuId + ":").concat(mobile);
String rdkW = GoblinRedisConst.REDIS_WHITE.concat(listId + ":").concat(skuId + "").concat(mobile); String rdkW = GoblinRedisConst.REDIS_WHITE.concat(listId + ":").concat(skuId + ":").concat(mobile);
boolean bResult = redisUtil.hasKey(rdkB);//是否黑名单 boolean bResult = redisUtil.hasKey(rdkB);//是否黑名单
boolean wResult = redisUtil.hasKey(rdkW);//是否白名单 boolean wResult = redisUtil.hasKey(rdkW);//是否白名单
Integer memberStage = getMember(uid); Integer memberStage = getMember(uid);
......
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