From fa040a6529082e784899cf966a2f4d06d85cb42c Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 14 Jan 2025 18:39:00 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E5=A5=96=E5=93=81=E9=A2=86=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/discSpinning/entity/DiscSpinningRecord.java | 4 ++++ .../discSpinning/service/impl/DiscSpinningServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 09e76e24..44e33539 100644 --- a/src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningRecord.java +++ b/src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningRecord.java @@ -45,6 +45,10 @@ public class DiscSpinningRecord extends Model { //来源 task 任务 order 订单 private String source = "order"; + @TableField(exist = false) + @JsonSerialize(using = ToStringSerializer.class) + private Long discSpinningId; + public DiscSpinningRecord() { } 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 d4036c32..ee7d9a50 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 @@ -168,7 +168,7 @@ public class DiscSpinningServiceImpl extends ServiceImpl Date: Tue, 14 Jan 2025 18:49:56 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E5=A4=A7=E8=BD=AC=E7=9B=98=E8=A1=A5?= =?UTF-8?q?=E5=81=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/job/task/SpinningTask3.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/sqx/modules/job/task/SpinningTask3.java b/src/main/java/com/sqx/modules/job/task/SpinningTask3.java index 27dfd3ee..ec94dbda 100644 --- a/src/main/java/com/sqx/modules/job/task/SpinningTask3.java +++ b/src/main/java/com/sqx/modules/job/task/SpinningTask3.java @@ -32,7 +32,7 @@ public class SpinningTask3 { private Logger logger = LoggerFactory.getLogger(getClass()); - @Scheduled(cron = "0 0/1 * * * ? ") + @Scheduled(cron = "0 0/5 * * * ? ") public void record() { record("1"); } @@ -45,8 +45,8 @@ public class SpinningTask3 { params = "1"; } // 获取五分钟前的时间 - Date fiveMinutesAgo = DateUtil.offsetMinute(now, Integer.valueOf(params) * -6); - Date tenMinutesAgo = DateUtil.offsetMinute(now, (Integer.valueOf(params) * -6) - 6); + Date fiveMinutesAgo = DateUtil.offsetMinute(now, Integer.valueOf(params) * -5); + Date tenMinutesAgo = DateUtil.offsetMinute(now, (Integer.valueOf(params) * -5) - 15); // 将五分钟前的时间转换为指定格式的时间字符串，这里采用常见的"yyyy-MM-dd HH:mm:ss"格式 String fiveMinutesAgoStr = DateUtil.format(fiveMinutesAgo, "yyyy-MM-dd HH:mm:ss"); String tenMinutesAgoStr = DateUtil.format(tenMinutesAgo, "yyyy-MM-dd HH:mm:ss"); @@ -55,10 +55,10 @@ public class SpinningTask3 { recordQueryWrapper.isNull("target"); recordQueryWrapper.isNull("target_id"); recordQueryWrapper.eq("type", 2); - //大于 - recordQueryWrapper.lt("create_time", fiveMinutesAgoStr); - //小于 - recordQueryWrapper.gt("create_time", tenMinutesAgoStr); + //大于等于 + recordQueryWrapper.le("create_time", fiveMinutesAgoStr); + //小于等于 + recordQueryWrapper.ge("create_time", tenMinutesAgoStr); logger.info("大转盘到账补偿时间范围：{}-----{}", tenMinutesAgoStr, fiveMinutesAgoStr); List list = recordService.list(recordQueryWrapper); ThreadUtil.execAsync(() -> { From d85348c2b1b23bfbded1236a94c5747a563c312c Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 15 Jan 2025 09:36:08 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E5=A4=A7=E8=BD=AC=E7=9B=98=20=E5=9B=9E?= =?UTF-8?q?=E5=A1=ABId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discSpinning/service/impl/DiscSpinningServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 ee7d9a50..2a5f97b8 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 @@ -153,6 +153,7 @@ public class DiscSpinningServiceImpl extends ServiceImpl Date: Wed, 15 Jan 2025 10:26:20 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DiscSpinningServiceImpl.java | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) 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 2a5f97b8..2be718c9 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 @@ -48,6 +48,8 @@ public class DiscSpinningServiceImpl extends ServiceImpl amounts = new ArrayList<>(); Map> amountMaps = redisUtils.getMapData(RedisKeys.getDateKey("spinning:amount:") + source, "setDiscSpinningAmounts", DiscSpinningAmount.class); if (CollectionUtil.isNotEmpty(amountMaps)) { @@ -134,14 +136,12 @@ public class DiscSpinningServiceImpl extends ServiceImpl Date: Wed, 15 Jan 2025 10:37:52 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/app/AppController.java | 18 ++++++++++++++---- .../java/com/sqx/modules/app/dto/AuthDTO.java | 5 +++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppController.java b/src/main/java/com/sqx/modules/app/controller/app/AppController.java index 4735bb84..7e85fcfd 100644 --- a/src/main/java/com/sqx/modules/app/controller/app/AppController.java +++ b/src/main/java/com/sqx/modules/app/controller/app/AppController.java @@ -16,6 +16,7 @@ import com.sqx.common.utils.DesensitizedUtil; import com.sqx.common.utils.Result; import com.sqx.modules.app.annotation.Login; import com.sqx.modules.app.annotation.LoginUser; +import com.sqx.modules.app.dto.AuthDTO; import com.sqx.modules.app.dto.AuthRespDTO; import com.sqx.modules.app.entity.TbUserBlacklist; import com.sqx.modules.app.entity.UserEntity; @@ -112,7 +113,7 @@ public class AppController { if (StrUtil.isAllBlank(zhiFuBao, certName)) { return Result.error("支付宝账号或姓名不能为空"); } - if(zhiFuBao.contains("*") || certName.contains("*")){ + if (zhiFuBao.contains("*") || certName.contains("*")) { return Result.success(); } UserEntity userEntity = userService.getById(userId); @@ -146,12 +147,21 @@ public class AppController { return Result.success(); } + @Login + @PostMapping(value = "/realNameAuth/v2") + @ApiOperation("实名认证") + @ResponseBody + @Debounce(interval = 3000, value = "#userId") + public Result realNameAuth(@RequestAttribute("userId") Long userId, @RequestBody AuthDTO auth) { + return realNameAuth(userId, auth.getCertName(), auth.getIdNum(), auth.getAccountNo(), auth.getMobile()); + } + @Login @RequestMapping(value = "/realNameAuth", method = RequestMethod.POST) @ApiOperation("实名认证") @ResponseBody @Debounce(interval = 3000, value = "#userId") - public Result bindAlipay(@RequestAttribute("userId") Long userId, + public Result realNameAuth(@RequestAttribute("userId") Long userId, @RequestParam String certName, @RequestParam String certNum, @RequestParam String accountNo, @@ -160,7 +170,7 @@ public class AppController { if (StrUtil.isAllBlank(certName, certNum, accountNo, mobile)) { return Result.error("真实姓名、身份证号码、银行卡号、银行预留手机号缺一不可"); } - if(certNum.contains("*") || accountNo.contains("*") || mobile.contains("*")){ + if (certNum.contains("*") || accountNo.contains("*") || mobile.contains("*")) { return Result.success(); } int count = userInfoService.count(Wrappers.lambdaQuery() @@ -268,7 +278,7 @@ public class AppController { } Map map = BeanUtil.beanToMap(user); map.putAll(BeanUtil.beanToMap(userInfo)); - map.put("userId",map.get("userId").toString()); + map.put("userId", map.get("userId").toString()); if (StrUtil.isBlank(user.getZhiFuBaoName()) && StrUtil.isNotBlank(userInfo.getCertName())) { map.put("zhiFuBaoName", userInfo.getCertName()); } diff --git a/src/main/java/com/sqx/modules/app/dto/AuthDTO.java b/src/main/java/com/sqx/modules/app/dto/AuthDTO.java index 4e395504..735a9c70 100644 --- a/src/main/java/com/sqx/modules/app/dto/AuthDTO.java +++ b/src/main/java/com/sqx/modules/app/dto/AuthDTO.java @@ -11,6 +11,11 @@ public class AuthDTO { @NotBlank private String idNum; + @NotBlank + private String certName; + @NotBlank + private String certNum; + @NotBlank private String accountNo; From 07148d42241b9b96aa806f32e028c95709fb3d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Wed, 15 Jan 2025 10:41:11 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sqx/modules/app/controller/app/AppController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppController.java b/src/main/java/com/sqx/modules/app/controller/app/AppController.java index 7e85fcfd..9da79c04 100644 --- a/src/main/java/com/sqx/modules/app/controller/app/AppController.java +++ b/src/main/java/com/sqx/modules/app/controller/app/AppController.java @@ -153,7 +153,7 @@ public class AppController { @ResponseBody @Debounce(interval = 3000, value = "#userId") public Result realNameAuth(@RequestAttribute("userId") Long userId, @RequestBody AuthDTO auth) { - return realNameAuth(userId, auth.getCertName(), auth.getIdNum(), auth.getAccountNo(), auth.getMobile()); + return realNameAuth(userId, auth.getCertName(), auth.getCertNum(), auth.getAccountNo(), auth.getMobile()); } @Login From 944f841aaa85eabe5c23b4c51d961871d4afa9fe Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 15 Jan 2025 10:55:19 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E8=BD=AC=E7=9B=98=20?= =?UTF-8?q?=E4=B8=8D=E8=BF=94=E5=9B=9E=E6=A6=82=E7=8E=87=20=E6=8A=BD?= =?UTF-8?q?=E5=A5=96=E8=BD=AC=E7=9B=98=20=E4=BB=BB=E5=8A=A1=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=20=E5=8D=95=E6=AC=A1=E4=BB=BB=E5=8A=A1=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DiscSpinningController.java | 11 ++++++++--- .../service/impl/TaskCenterServiceImpl.java | 6 +++--- 2 files changed, 11 insertions(+), 6 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 612cb8d7..5673ea0d 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java @@ -129,9 +129,14 @@ public class DiscSpinningController { @ApiOperation("查询大转盘") public Result selectDiscSpinning(@RequestParam(required = false, defaultValue = "1") Integer source) { PageHelper.startPage(1, 20); - return Result.success().put("data", PageUtils.page(new PageInfo<>(discSpinningService.list( - new QueryWrapper().eq("disc_type", source).orderByAsc("disc_type", "odds"))), true) - ); + List list = discSpinningService.list( + new QueryWrapper().eq("disc_type", source).orderByAsc("disc_type", "odds")); + for (DiscSpinning discSpinning : list) { + discSpinning.setOdds(null); + discSpinning.setNumber(null); + discSpinning.setDiscType(null); + } + return Result.success().put("data", PageUtils.page(new PageInfo<>(list), true)); } 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 bec84e0e..23daef53 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 @@ -199,6 +199,9 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) { + continue; + } Integer sumOrderNum = 0; if (inviteAchievement != null) { sumOrderNum = inviteAchievement.getCount(); @@ -206,9 +209,6 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) { - continue; } else { s.setDiscNumber(null); s.setNumber(null); From 95d61b5effe25bafe109a02b6384ead8e6541762 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 16 Jan 2025 09:30:10 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E9=87=91=E5=B8=81=E8=A7=A3=E9=94=81?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/orders/service/impl/OrdersServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java index 7f008505..8bc1d483 100644 --- a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java @@ -553,8 +553,8 @@ public class OrdersServiceImpl extends ServiceImpl implements UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); userMoneyDetails.setMoney(orders.getPayDiamond()); userMoneyDetails.setUserId(orders.getUserId()); - userMoneyDetails.setContent("金币解锁视频"); - userMoneyDetails.setTitle("解锁成功，订单号：" + orders.getOrdersNo()); + userMoneyDetails.setContent("解锁成功"); + userMoneyDetails.setTitle("金币解锁视频"); userMoneyDetails.setType(2); // ✅ userMoneyDetails.setClassify(3); From d5aa722bf0616e072331b89baf9666729cbec443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 16 Jan 2025 11:18:35 +0800 Subject: [PATCH 09/20] =?UTF-8?q?uniapp=E5=B9=BF=E5=91=8A=E7=A7=98?= =?UTF-8?q?=E9=92=A5=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 930d7734..b20560aa 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -158,4 +158,4 @@ sqx: expire: 604800 header: token uni: - adSecret: 122e4ff1edc66dcf8761f7f7ffc81e0f8773cbfafb58aed29c72fbd092c77315 + adSecret: cbc34e14ee6d64738557c96623dd6da89f77cac8ae519c6a5c87191d614d386a From 2dd2641befaefbd192e67e6d1eba012a5fe9d74d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 16 Jan 2025 14:38:14 +0800 Subject: [PATCH 10/20] =?UTF-8?q?uniapp=E5=B9=BF=E5=91=8A=E5=AE=8C?= =?UTF-8?q?=E6=92=AD=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/app/controller/app/AdController.java | 14 ++++++++++++-- .../service/UniAdCallbackRecordService.java | 2 +- .../impl/UniAdCallbackRecordServiceImpl.java | 4 ++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/controller/app/AdController.java b/src/main/java/com/sqx/modules/app/controller/app/AdController.java index 877d755e..b3cbbdd2 100644 --- a/src/main/java/com/sqx/modules/app/controller/app/AdController.java +++ b/src/main/java/com/sqx/modules/app/controller/app/AdController.java @@ -4,25 +4,35 @@ import com.sqx.common.utils.Result; import com.sqx.modules.app.annotation.Login; import com.sqx.modules.app.service.AdService; import com.sqx.modules.callback.service.UniAdCallbackRecordService; +import com.sqx.modules.redisService.RedisService; import com.sqx.modules.sys.controller.AbstractController; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; + @RestController @RequestMapping("/app/ad") public class AdController extends AbstractController { private final UniAdCallbackRecordService callbackRecordService; private final AdService adService; + private final RedisService redisService; - public AdController(UniAdCallbackRecordService callbackRecordService, AdService adService) { + public AdController(UniAdCallbackRecordService callbackRecordService, AdService adService, RedisService redisService) { this.callbackRecordService = callbackRecordService; this.adService = adService; + this.redisService = redisService; } @Login @GetMapping("/state") public Result getAdState(@RequestParam String extraKey, @RequestAttribute Long userId) { - return Result.success(callbackRecordService.getStateByExtraKey(userId, extraKey)); + HashMap info = callbackRecordService.getStateByExtraKey(userId, extraKey); + if (info.get("isEnded") == 0 && !redisService.isCanCash(userId)) { + redisService.setCanCashFlag(userId, -1L); + info.put("isEnded", 1); + } + return Result.success(); } @Login diff --git a/src/main/java/com/sqx/modules/callback/service/UniAdCallbackRecordService.java b/src/main/java/com/sqx/modules/callback/service/UniAdCallbackRecordService.java index 301aabbb..e04a81b6 100644 --- a/src/main/java/com/sqx/modules/callback/service/UniAdCallbackRecordService.java +++ b/src/main/java/com/sqx/modules/callback/service/UniAdCallbackRecordService.java @@ -16,5 +16,5 @@ public interface UniAdCallbackRecordService extends IService adCallBack(UniAdCallBackDTO callBackDTO); - HashMap getStateByExtraKey(Long userId, String extraKey); + HashMap getStateByExtraKey(Long userId, String extraKey); } diff --git a/src/main/java/com/sqx/modules/callback/service/impl/UniAdCallbackRecordServiceImpl.java b/src/main/java/com/sqx/modules/callback/service/impl/UniAdCallbackRecordServiceImpl.java index 2174a5f9..4ca16e2b 100644 --- a/src/main/java/com/sqx/modules/callback/service/impl/UniAdCallbackRecordServiceImpl.java +++ b/src/main/java/com/sqx/modules/callback/service/impl/UniAdCallbackRecordServiceImpl.java @@ -129,10 +129,10 @@ public class UniAdCallbackRecordServiceImpl extends ServiceImpl getStateByExtraKey(Long userId, String extraKey) { + public HashMap getStateByExtraKey(Long userId, String extraKey) { UniAdCallbackRecord one = getOne(new LambdaQueryWrapper().eq(UniAdCallbackRecord::getUserId, userId) .eq(UniAdCallbackRecord::getExtra, extraKey)); - return new HashMap(){{ + return new HashMap(){{ put("isEnded", one == null ? 0 : 1); }}; } From 81e4a0b5fc7fa61b9bfaa2d3e54ee94a666043b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 16 Jan 2025 14:46:44 +0800 Subject: [PATCH 11/20] =?UTF-8?q?uniapp=E5=B9=BF=E5=91=8A=E5=AE=8C?= =?UTF-8?q?=E6=92=AD=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sqx/modules/redisService/RedisService.java | 3 +++ .../com/sqx/modules/redisService/impl/RedisServiceImpl.java | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/src/main/java/com/sqx/modules/redisService/RedisService.java b/src/main/java/com/sqx/modules/redisService/RedisService.java index f486f5ab..a81dc759 100644 --- a/src/main/java/com/sqx/modules/redisService/RedisService.java +++ b/src/main/java/com/sqx/modules/redisService/RedisService.java @@ -32,4 +32,7 @@ public interface RedisService { boolean isCanCash(Long userId); boolean setCreateOrderFlagAndCheckLimit(Long userId, Long orderId); + + void removeCanCashFlag(Long userId); + } 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 b2129794..a2439e7f 100644 --- a/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java +++ b/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java @@ -348,6 +348,12 @@ public class RedisServiceImpl implements RedisService { return StrUtil.isNotBlank(s); } + @Override + public void removeCanCashFlag(Long userId) { + String key = "cash:canCash:" + userId; + redisUtils.delete(key); + } + @Override public boolean setCreateOrderFlagAndCheckLimit(Long userId, Long orderId) { String key = "createOrder:" + userId + ":" + orderId; From c761ef7c3d054c0a316d4c309c0d250fbd69e753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 16 Jan 2025 14:47:00 +0800 Subject: [PATCH 12/20] =?UTF-8?q?uniapp=E5=B9=BF=E5=91=8A=E5=AE=8C?= =?UTF-8?q?=E6=92=AD=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/pay/controller/app/AppCashController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/sqx/modules/pay/controller/app/AppCashController.java b/src/main/java/com/sqx/modules/pay/controller/app/AppCashController.java index d3fcba43..05647f96 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/AppCashController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/AppCashController.java @@ -113,6 +113,7 @@ public class AppCashController { ret = cashOutService.withdraw(userId, amount, null, false); int code = Convert.toInt(ret.get("code"), -1); if (code == 0) { + redisService.removeCanCashFlag(userId); redisUtils.set(intervalKey, true, 60 * 3); } } catch (Exception e) { From ac2a215df43ce1c6437c31ee952d9814252e1245 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 16 Jan 2025 14:48:45 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=A2=86=E5=8F=96?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discSpinning/controller/DiscSpinningController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 5673ea0d..6d976d76 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java @@ -1,5 +1,6 @@ package com.sqx.modules.discSpinning.controller; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -233,6 +234,9 @@ public class DiscSpinningController { redisKey = RedisKeys.getDateKey("spinning:draw:taskM") + userId; } Map week = redisUtils.get(redisKey, Map.class); + if (CollectionUtil.isEmpty(week)) { + return Result.error("请求失败，请联系管理员"); + } for (Map.Entry entry : week.entrySet()) { int value = new BigDecimal(entry.getValue().toString()).intValue(); if (value > 1) { From f38d7861704cd16533066df9b55bab527cc91892 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 16 Jan 2025 14:49:08 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83=20?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E6=80=A7=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TaskCenterServiceImpl.java | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) 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 23daef53..f1a7c8b2 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 @@ -100,10 +100,11 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) { - s.setButtonTitle("已领取"); - s.setDisabled(false); - s.setNumber(null); - break; +// s.setButtonTitle("已领取"); +// s.setDisabled(false); +// s.setNumber(null); +// break; + continue; } boolean isBreak = false; //抽奖次数 @@ -127,9 +128,10 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) { @@ -251,6 +254,8 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) return Result.error("同一实名算一个新用户，不可重复领取"); } + }else { + return Result.error("异常领取，已记录"); } List records = new ArrayList<>(); Long targetId = null; From 46cd04358c86fde573b9960b9eedb278c946e69e Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 16 Jan 2025 14:50:09 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E6=9C=88=E4=BB=BB=E5=8A=A1=E6=8A=BD?= =?UTF-8?q?=E5=A5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discSpinning/controller/DiscSpinningController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 6d976d76..860a252a 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java @@ -231,6 +231,10 @@ public class DiscSpinningController { } redisKey = RedisKeys.getDateKey("spinning:draw:taskW") + userId; } else if (source.equals(3)) { + Integer spinningCount = recordService.countSourceRecord(null, userId, "taskM"); + if (spinningCount != null && spinningCount > 0) { + return Result.error("月抽奖用户仅可参加一次"); + } redisKey = RedisKeys.getDateKey("spinning:draw:taskM") + userId; } Map week = redisUtils.get(redisKey, Map.class); From 10e48d887e2ad3642625c7da2735c39089eca1db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 16 Jan 2025 14:50:39 +0800 Subject: [PATCH 16/20] =?UTF-8?q?uniapp=E5=B9=BF=E5=91=8A=E5=AE=8C?= =?UTF-8?q?=E6=92=AD=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9?= 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 a2439e7f..be06f1b2 100644 --- a/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java +++ b/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java @@ -338,7 +338,7 @@ public class RedisServiceImpl implements RedisService { @Override public void setCanCashFlag(Long userId, Long id) { String key = "cash:canCash:" + userId; - redisUtils.set(key, id, 30); + redisUtils.set(key, id, 300); } @Override From 78ea1f6e50b604adfcbb0875939548b64b71d269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Fri, 17 Jan 2025 16:43:18 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=A7=A3=E9=94=81=E7=9F=AD=E5=89=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../course/service/impl/CourseDetailsServiceImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java index 5fc1a065..fcb99135 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java @@ -171,6 +171,13 @@ public class CourseDetailsServiceImpl extends ServiceImpl 3 && (CollectionUtil.isEmpty(finalDetailsId) || !finalDetailsId.contains(s.getCourseDetailsId())) && courseUser == null) { + if (!freeWatch && s.getSort() > 3 && (CollectionUtil.isEmpty(finalDetailsId) || !finalDetailsId.contains(s.getCourseDetailsId())) && courseUser == null && !isVip) { s.setVideoUrl(null); } if (s.getSort() > finalStartSort && s.getSort() < finalEndSort) { @@ -239,7 +246,7 @@ public class CourseDetailsServiceImpl extends ServiceImpl Date: Thu, 16 Jan 2025 14:53:32 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A5=96=E5=8A=B1=20?= =?UTF-8?q?=E5=AE=9E=E7=89=A9=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TaskCenterRewardController.java | 9 ++++++++- .../sqx/modules/taskCenter/entity/TaskCenterReward.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java index 0f0f5d5a..706a2781 100644 --- a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java +++ b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java @@ -2,7 +2,11 @@ package com.sqx.modules.taskCenter.controller; import cn.hutool.core.date.DateUtil; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sqx.common.utils.PageUtils; import com.sqx.modules.app.annotation.Login; +import com.sqx.modules.app.entity.App; import com.sqx.modules.taskCenter.entity.TaskCenterRecord; import com.sqx.modules.taskCenter.entity.TaskCenterReward; import com.sqx.modules.taskCenter.service.TaskCenterRecordService; @@ -80,7 +84,10 @@ public class TaskCenterRewardController { @GetMapping("/selectTaskCenterReward") @ApiOperation("查询任务奖励") public Result selectTaskCenterReward(Integer page, Integer limit, TaskCenterReward taskCenterReward) { - return Result.success().put("data", taskCenterRewardService.page(new Page<>(page, limit), new QueryWrapper<>(taskCenterReward).orderByDesc("id"))); + PageHelper.startPage(page == null ? 0 : page, limit == null ? 10 : limit); + List list = taskCenterRewardService.list(new QueryWrapper<>(taskCenterReward).orderByDesc("id")); + PageInfo pageInfo = new PageInfo<>(list); + return Result.success().put("data", PageUtils.page(pageInfo, true)); } @Login diff --git a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java index c6bff50a..592fb8ca 100644 --- a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java +++ b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java @@ -29,7 +29,7 @@ public class TaskCenterReward extends Model { private String img; @ApiModelProperty("奖励名称") private String name; - @ApiModelProperty("奖励类型 1 金币 2 现金红包 3 4 5 9 大转盘抽奖次数") + @ApiModelProperty("奖励类型 1 金币 2 现金红包 3实物 4 5 9 大转盘抽奖次数") private Integer type; @TableField(exist = false) @JsonSerialize(using = ToStringSerializer.class) From 775da894a7e0542494b832b64d69974280d68bc5 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 20 Jan 2025 15:16:15 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A5=96=E5=8A=B1=20?= =?UTF-8?q?=E5=AE=9E=E7=89=A9=E9=A2=86=E5=8F=96=20=E6=9C=88=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=8A=BD=E5=A5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discSpinning/controller/DiscSpinningController.java | 4 ++-- .../modules/taskCenter/controller/TaskCenterController.java | 2 +- 2 files changed, 3 insertions(+), 3 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 860a252a..e17dd0c4 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java @@ -252,10 +252,10 @@ 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(sourceId); - } +// } centerRecord.setName(source.equals(2) ? "周任务奖励" : "月任务奖励"); centerRecord.setType(9); centerRecord.setNumber(1); diff --git a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java index a8191819..dbb28317 100644 --- a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java +++ b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java @@ -124,7 +124,7 @@ public class TaskCenterController { @ApiImplicitParam(name = "sourceId", value = "实物(物品Id)", dataTypeClass = Long.class, paramType = "body") }) @Debounce(interval = 600000, value = "#userId,#record.taskId") - public Result receiveGoods(@ApiIgnore @RequestAttribute("userId") Long userId,@ApiIgnore TaskCenterRecord record) { + public Result receiveGoods(@ApiIgnore @RequestAttribute("userId") Long userId,@ApiIgnore @RequestBody TaskCenterRecord record) { TaskCenter task = taskCenterService.getById(record.getTaskId()); if (Objects.isNull(task)) { return Result.error("任务不存在。"); From 086e1961f9efa2499796fa38144b4d17fe1a0fe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Mon, 20 Jan 2025 16:10:20 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=AD=BE=E5=88=B0=E9=A2=86=E5=8F=96=E5=A5=96=E5=8A=B1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TaskCenterRewardController.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java index 706a2781..4cb81d41 100644 --- a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java +++ b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java @@ -2,19 +2,17 @@ package com.sqx.modules.taskCenter.controller; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.sqx.common.utils.DateUtils; import com.sqx.common.utils.PageUtils; +import com.sqx.common.utils.Result; import com.sqx.modules.app.annotation.Login; -import com.sqx.modules.app.entity.App; import com.sqx.modules.taskCenter.entity.TaskCenterRecord; import com.sqx.modules.taskCenter.entity.TaskCenterReward; import com.sqx.modules.taskCenter.service.TaskCenterRecordService; import com.sqx.modules.taskCenter.service.TaskCenterRewardService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.sqx.common.utils.DateUtils; -import com.sqx.common.utils.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -113,7 +111,7 @@ public class TaskCenterRewardController { } } map.put("receive", record.getSourceId()); - map.put("record", record.getId()); + map.put("record", record.getId()+""); } map.put("data", list); return Result.success(map);