From 313a2f9745c9a7e1f3b21e7d9d3a2b9c608f5ba3 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 5 Feb 2025 09:20:23 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=8A=BD=E4=B8=AD?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../discSpinning/service/impl/DiscSpinningServiceImpl.java    | 4 ----
 1 file changed, 4 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 ee57d827..af812ef2 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
@@ -167,10 +167,6 @@ public class DiscSpinningServiceImpl extends ServiceImpl<DiscSpinningDao, DiscSp
             }
         }
 
-        if (result.getName().contains("手机")) {
-            throw new RuntimeException("抽奖数据异常，请稍后再试");
-        }
-
         DiscSpinningRecord record = new DiscSpinningRecord(result.getName(), sourceId, userId, result.getUrl(), result.getType(),
                 result.getNumber(), DateUtils.formatYMD(new Date()), DateUtils.format(new Date()), source);
         recordService.save(record);

From ce68fa27537d8e0fe8bbea70ad786c065892de85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Wed, 5 Feb 2025 10:34:44 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=8F=90=E7=8E=B0=E5=92=8C=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sqx/modules/app/controller/app/AdController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 b3cbbdd2..31c7927b 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
@@ -28,7 +28,7 @@ public class AdController extends AbstractController {
     @GetMapping("/state")
     public Result getAdState(@RequestParam String extraKey, @RequestAttribute Long userId) {
         HashMap<String, Integer> info = callbackRecordService.getStateByExtraKey(userId, extraKey);
-        if (info.get("isEnded") == 0 && !redisService.isCanCash(userId)) {
+        if (info.get("isEnded") == 0 && !redisService.isCanCash(userId) && extraKey.contains("cash")) {
             redisService.setCanCashFlag(userId, -1L);
             info.put("isEnded", 1);
         }

From 9cc7447728cfcc037b3cfb0f354905236554d8d5 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, 11 Feb 2025 09:37:56 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=B8=A0=E9=81=93=E7=A0=81=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sqx/modules/app/service/impl/UserServiceImpl.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
index 96716795..e1f0b810 100644
--- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
@@ -915,6 +915,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
         }
         userInfo.setUpdateTime(DateUtil.date().toString());
         baseMapper.updateById(userInfo);
+        userInfo.setQdCode(userInfo.getQdCode() == null ? "" : userInfo.getQdCode());
         return getResult(userInfo);
     }
 

From 0bb12a2df4e3e9d881b53d36ba07463a3f17fb4a Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 24 Feb 2025 18:39:11 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E8=AE=B0=E5=BD=95=20?=
 =?UTF-8?q?=E7=BB=99=E9=92=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../discSpinning/service/impl/DiscSpinningServiceImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 af812ef2..d21f42fc 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
@@ -177,7 +177,7 @@ public class DiscSpinningServiceImpl extends ServiceImpl<DiscSpinningDao, DiscSp
 
     @Override
     public void receive1(DiscSpinningRecord receive) {
-        if (recordService.countDraw(receive.getUserId()) > 10) {
+        if (recordService.countDraw(receive.getUserId()) > Integer.parseInt(commonRepository.findOne(901).getValue())) {
             return;
         }
         DiscSpinningRecord record = recordService.getById(receive.getId());