From 9129feb2047cb8bb5c5ee3897a88469890e9a84d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 24 Dec 2024 15:41:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E5=B9=BF=E5=91=8A=E7=B4=AF=E8=AE=A1?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8D=E6=AD=A3=E7=A1=AE=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/redisService/impl/RedisServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java b/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java index 33a9f5d3..87737b49 100644 --- a/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java +++ b/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java @@ -52,7 +52,7 @@ public class RedisServiceImpl implements RedisService { }else { Long expire = redisUtils.getExpire(freeWatchKey); if (expire == null) { - expire = Long.valueOf(second); + expire = -1L; }else { expire += Long.valueOf(second); } From 054ecad4d8c340cf4072824a04b5bba38085ea78 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Tue, 24 Dec 2024 16:50:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=94=B6=E7=9B=8A?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20=E7=B1=BB=E5=9E=8B=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/app/service/impl/UserMoneyDetailsServiceImpl.java | 1 + src/main/resources/mapper/app/UserMoneyDetailsDao.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java index fea124a4..46e153f0 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java @@ -43,6 +43,7 @@ public class UserMoneyDetailsServiceImpl extends ServiceImpl From cb20edf09757a5bc082098577eb9f0a5b9e2f1be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 24 Dec 2024 16:59:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E6=97=B6=E9=97=B4=E6=88=B3=E6=BA=A2?= =?UTF-8?q?=E5=87=BA=E5=AF=BC=E8=87=B4=E6=97=B6=E9=97=B4=E5=A4=B1=E6=95=88?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/redisService/impl/RedisServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java b/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java index 87737b49..7c45e604 100644 --- a/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java +++ b/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java @@ -77,11 +77,11 @@ public class RedisServiceImpl implements RedisService { String watchKey = RedisKeys.getFreeWatchKey(userId, false); String payFreeWatchInfo = redisUtils.get(watchKey); - Integer expireTime = -1; + Long expireTime = -1L; JSONObject jsonObject = null; if (StrUtil.isNotBlank(payFreeWatchInfo)) { jsonObject = JSONObject.parseObject(payFreeWatchInfo); - expireTime = jsonObject.getInteger("expireTime"); + expireTime = jsonObject.getLong("expireTime"); } if ((StrUtil.isNotBlank(permanentlyFreeWatch) && redisUtils.isExpiredSet(freeWatchKey)) || (StrUtil.isNotBlank(permanentlyFreeWatch) && DateUtil.current() >= expireTime)) { From 75a4c5e4fc1e7316bec3d9b7422a8ecab9fa1429 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 24 Dec 2024 17:31:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9C=88=E6=8A=BD=E5=A5=96=20=E6=8A=BD?= =?UTF-8?q?=E5=A5=96=E8=AE=B0=E5=BD=95=20=E5=A2=9E=E5=8A=A0=20=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DiscSpinningController.java | 10 +++++----- .../discSpinning/entity/DiscSpinningRecord.java | 4 +++- .../service/impl/DiscSpinningRecordServiceImpl.java | 1 + .../service/impl/DiscSpinningServiceImpl.java | 3 ++- .../service/impl/TaskCenterRewardServiceImpl.java | 2 +- .../taskCenter/service/impl/TaskCenterServiceImpl.java | 6 +++--- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java index a1233e60..6a4e550e 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java @@ -187,11 +187,11 @@ public class DiscSpinningController { } amount = orders.getPayMoney().doubleValue(); sourceId = orders.getOrdersId(); - } else { + } else { String redisKey = ""; - if (source.equals(2)){ + if (source.equals(2)) { redisKey = RedisKeys.getDateKey("spinning:amount:taskW") + userId; - }else if(source.equals(3)){ + } else if (source.equals(3)) { redisKey = RedisKeys.getDateKey("spinning:amount:taskM") + userId; } Map week = redisUtils.get(redisKey, Map.class); @@ -206,7 +206,7 @@ public class DiscSpinningController { TaskCenterRecord centerRecord = new TaskCenterRecord(); centerRecord.setUserId(userId); centerRecord.setTaskId(Long.valueOf(entry.getKey())); - if(source.equals(2)){ + if (source.equals(2)) { sourceId = Long.valueOf(entry.getKey()); centerRecord.setSourceId(Long.getLong(entry.getKey())); } @@ -220,7 +220,7 @@ public class DiscSpinningController { break; } } - redisUtils.set(redisKey,week,DateUtils.todayAfterSecond()); + redisUtils.set(redisKey, week, DateUtils.todayAfterSecond()); } return new Result().put("data", discSpinningService.draws(i == null ? 1 : i + 1, amount, sourceId, userId, source)); diff --git a/src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningRecord.java b/src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningRecord.java index 7fc6bfef..f5974d49 100644 --- a/src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningRecord.java +++ b/src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningRecord.java @@ -26,6 +26,7 @@ public class DiscSpinningRecord extends Model { private Long sourceId; private Long userId; + private String imgUrl; //描述 private String name; //类型 1谢谢惠顾 2 红包 9 其它 @@ -46,11 +47,12 @@ public class DiscSpinningRecord extends Model { public DiscSpinningRecord() { } - public DiscSpinningRecord(String name, Long sourceId, Long userId, Integer type, BigDecimal number, + public DiscSpinningRecord(String name, Long sourceId, Long userId,String imgUrl, Integer type, BigDecimal number, String drawDay, String createTime, Integer source) { this.name = name; this.userId = userId; this.sourceId = sourceId; + this.imgUrl = imgUrl; this.type = type; this.number = number; this.drawDay = drawDay; diff --git a/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningRecordServiceImpl.java b/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningRecordServiceImpl.java index 985b73c5..0d1503e4 100644 --- a/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningRecordServiceImpl.java +++ b/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningRecordServiceImpl.java @@ -29,6 +29,7 @@ public class DiscSpinningRecordServiceImpl extends ServiceImpl recordQuery = new QueryWrapper<>(); recordQuery.eq("source_id", sourceId); + recordQuery.eq("source", "taskM"); recordQuery.gt("create_time", DateUtil.beginOfMonth(new Date())); return discSpinningRecordDao.selectCount(recordQuery); } diff --git a/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java b/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java index 434d79e0..98a96d08 100644 --- a/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java +++ b/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java @@ -216,12 +216,13 @@ public class DiscSpinningServiceImpl extends ServiceImpl getRewardMap(Long taskId) { + public Map getRewardMap(Long taskId) { List rewards = baseMapper.getRewardMap(taskId); Map map = rewards.stream() diff --git a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java index 0093a154..510f468b 100644 --- a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java +++ b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java @@ -97,11 +97,11 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) { - isBreak=true; + isBreak = true; break; } } - if (isBreak){ + if (isBreak) { s.setDiscNumber(null); s.setNumber(null); break; @@ -129,7 +129,7 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) { + if (spinningCount == null || rewardMap.get(9) - spinningCount > 0) { s.setDiscNumber(null); s.setNumber(null); break;