|
|
@@ -486,6 +486,7 @@ public class FsUserIntegralLogsServiceImpl implements IFsUserIntegralLogsService
|
|
|
int isNewUser = 1;
|
|
|
int isFinishConsultation = 0;
|
|
|
int isFinishFirstOrderPoint = 0;
|
|
|
+ boolean isFinishDownloadAppIntegral = false;
|
|
|
// long expireDays = 0;
|
|
|
Date createTime = null;
|
|
|
// FsUser fsUser = fsUserMapper.selectFsUserIsNew(userId);
|
|
|
@@ -533,6 +534,12 @@ public class FsUserIntegralLogsServiceImpl implements IFsUserIntegralLogsService
|
|
|
isFinishFirstOrderPoint = 1;
|
|
|
}
|
|
|
|
|
|
+ // 完成首次登录 app 获得积分(是否已领取下载/登录 APP 积分)
|
|
|
+ integralLogs = fsUserIntegralLogsMapper.selectFsUserIntegralLogsByUserIdAndLogType(userId, FsUserIntegralLogTypeEnum.TYPE_28.getValue(), null);
|
|
|
+ if (!integralLogs.isEmpty()) {
|
|
|
+ isFinishDownloadAppIntegral = true;
|
|
|
+ }
|
|
|
+
|
|
|
Map<String,Object> map = new HashMap<>();
|
|
|
map.put("taskOne",taskOne);
|
|
|
map.put("taskTwo",taskTwo);
|
|
|
@@ -541,6 +548,7 @@ public class FsUserIntegralLogsServiceImpl implements IFsUserIntegralLogsService
|
|
|
map.put("taskFive",taskFive);
|
|
|
map.put("isFinishConsultation", isFinishConsultation);
|
|
|
map.put("isFinishFirstOrderPoint", isFinishFirstOrderPoint);
|
|
|
+ map.put("isFinishDownloadAppIntegral", isFinishDownloadAppIntegral);
|
|
|
return R.ok().put("data",map).put("isNewUser",isNewUser).put("createTime",createTime);
|
|
|
}
|
|
|
|