|
|
@@ -194,7 +194,7 @@ public class RiceService {
|
|
|
// 判断上次签到时间是否为空,如果为空,则默认为从未签到过
|
|
|
if (lastSignInTime == null) {
|
|
|
return R.success("未签到").add("isSignedIn", false)
|
|
|
- .add("exchangeCount", rice.getExchangeCount() == null ? 0 : rice.getExchangeCount())
|
|
|
+ .add("exchangeCount", rice.getExchangeCount())
|
|
|
.add("isCanExchangeActivityScoreForWater", isCanExchangeActivityScoreForWater)
|
|
|
.add("isInvited", isInvited)
|
|
|
.add("isCanExchangeScore", isCanExchangeScore)
|
|
|
@@ -203,14 +203,14 @@ public class RiceService {
|
|
|
// 判断今天是否已经签到过
|
|
|
if (DateUtils.isSameDay(new Date(lastSignInTime), new Date(currentTime))) {
|
|
|
return R.success("已签到").add("isSignedIn", true)
|
|
|
- .add("exchangeCount", rice.getExchangeCount() == null ? 0 : rice.getExchangeCount())
|
|
|
+ .add("exchangeCount", rice.getExchangeCount())
|
|
|
.add("isCanExchangeActivityScoreForWater", isCanExchangeActivityScoreForWater)
|
|
|
.add("isInvited", isInvited)
|
|
|
.add("isCanExchangeScore", isCanExchangeScore)
|
|
|
.add("InviteHelpOthersCounts", InviteHelpOthersCounts);
|
|
|
} else {
|
|
|
return R.success("未签到").add("isSignedIn", false)
|
|
|
- .add("exchangeCount", rice.getExchangeCount() == null ? 0 : rice.getExchangeCount())
|
|
|
+ .add("exchangeCount", rice.getExchangeCount())
|
|
|
.add("isCanExchangeActivityScoreForWater", isCanExchangeActivityScoreForWater)
|
|
|
.add("isInvited", isInvited)
|
|
|
.add("isCanExchangeScore", isCanExchangeScore)
|