Merge branch 'quanku_v3.6' into quanku_v3.7

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserSigninServiceImpl.java

@@ -163,7 +163,7 @@ public class UserSigninServiceImpl implements UserSigninService {
             distributionOrder.setUpdateTime(new Date());
             distributionOrder.setType(DistributionEnum.DistributionTypeEnum.GIFT.getCode());
             distributionOrder.setRemark(null);
-            distributionOrder.setState(DistributionEnum.DistributionOrderStateEnum.PRE_SIGNED.getCode());
+            distributionOrder.setState(DistributionEnum.DistributionOrderStateEnum.PRE_SEND.getCode());
             distributionOrderDao.insert(distributionOrder);
             return Result.success();
         } catch (Exception e) {
@@ -189,11 +189,14 @@ public class UserSigninServiceImpl implements UserSigninService {
 
             //检查昨天是否打过卡
             UserSignIn yesterdaySignIn = userSignInDao.findYesterdayRecord(userId);
-            if (yesterdaySignIn == null) {
+            if (yesterdaySignIn == null && todayRecord == null) {
                 //连续签到天数
                 resultMap.put("consecutiveDays", 0);
                 //还需签到的天数
                 resultMap.put("needConsecutiveDays", 7);
+            } else if (yesterdaySignIn == null && todayRecord != null) {
+                resultMap.put("consecutiveDays", todayRecord.getConsecutiveDays());
+                resultMap.put("needConsecutiveDays", 6);
             } else {
                 if (todayRecord != null) {
                     resultMap.put("consecutiveDays", todayRecord.getConsecutiveDays());
@@ -201,12 +204,14 @@ public class UserSigninServiceImpl implements UserSigninService {
                     resultMap.put("consecutiveDays", yesterdaySignIn.getConsecutiveDays());
                 }
                 int consecutiveDays = Integer.valueOf(resultMap.get("consecutiveDays").toString());
-                if (yesterdaySignIn.getConsecutiveDays() < 7) {
+                if (consecutiveDays < 7) {
                     resultMap.put("needConsecutiveDays", 7 - consecutiveDays);
                 } else if (consecutiveDays >= 7 && consecutiveDays < 14) {
                     resultMap.put("needConsecutiveDays", 14 - consecutiveDays);
-                } else {
+                } else if (consecutiveDays >=14 && consecutiveDays < 21) {
                     resultMap.put("needConsecutiveDays", 21 - consecutiveDays);
+                } else {
+                    resultMap.put("needConsecutiveDays", 7);
                 }
             }
             //当前是几号