From 04bc569186e8a25824757cf76459d87f70833372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E4=B9=90?= <419641032@qq.com>
Date: Tue, 25 Aug 2020 16:04:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=AD=BE=E5=88=B0=E5=91=A8?=
 =?UTF-8?q?=E6=9C=9F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crmeb/pub/controller/WeChatPushController.java |  2 +-
 .../user/service/impl/UserSignServiceImpl.java     | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/crmeb/src/main/java/com/zbkj/crmeb/pub/controller/WeChatPushController.java b/crmeb/src/main/java/com/zbkj/crmeb/pub/controller/WeChatPushController.java
index 005f11c1..62918223 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/pub/controller/WeChatPushController.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/pub/controller/WeChatPushController.java
@@ -47,7 +47,7 @@ public class WeChatPushController {
             @ApiImplicitParam(name="message", value="推送消息内容"),
             @ApiImplicitParam(name="token", value="企业微信群token"),
     })
-    public CommonResult<Object> gitlab(@RequestBody(required = true) String message,
+    public CommonResult<Object> gitlab(@RequestBody String message,
                                        @RequestParam(name = "token", required = true) String token){
 
         Map<String, Object> map = new HashMap<>();
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserSignServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserSignServiceImpl.java
index 8aaaae32..a6b2a0c3 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserSignServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserSignServiceImpl.java
@@ -229,6 +229,12 @@ public class UserSignServiceImpl extends ServiceImpl<UserSignDao, UserSign> impl
         User user = userService.getInfo();
         BeanUtils.copyProperties(user, userSignInfoResponse);
 
+        //当前用户已经签到完一个周期，那么重置
+        if(user.getSignNum().equals(config().size())){
+            userSignInfoResponse.setSignNum(0);
+            userService.repeatSignNum(user.getUid());
+        }
+
         //签到
         if(request.getAll() || request.getSign()){
             userSignInfoResponse.setSumSignDay(getCount(user.getUid()));
@@ -317,11 +323,19 @@ public class UserSignServiceImpl extends ServiceImpl<UserSignDao, UserSign> impl
 
         //获取签到数据
         List<SystemGroupDataSignConfigVo> config = config();
+
+        //如果已经签到一个周期，那么再次签到的时候直接从第一天重新开始
+        if(user.getSignNum().equals(config.size())){
+            user.setSignNum(0);
+            userService.repeatSignNum(userId);
+        }
+
         for (SystemGroupDataSignConfigVo systemSignConfigVo : config) {
             if(user.getSignNum() + 1 <= systemSignConfigVo.getDay()){
                 return systemSignConfigVo;
             }
         }
+
         return null;
     }