Skip to content

wangming / kzy-wx

Go to a project
Commit 642ca12d by 魏文甫
Options

Merge branch 'wei_master' into '105' 

update

See merge request !24
2 parents 60f3656f dea580b7
Inline Side-by-side
Showing with 4 additions and 15 deletions
src/main/java/com/server/web/common/service/Impl/UserServiceImpl.java
...@@ -109,7 +109,7 @@ public class UserServiceImpl implements UserService { ...@@ -109,7 +109,7 @@ public class UserServiceImpl implements UserService {
@Override @Override
public Map<String, Object> signInList(TKzyUser loginUser) { public Map<String, Object> signInList(TKzyUser loginUser) {
//List<String> dayList = getDayListOfMonth(); //List<String> dayList = getDayListOfMonth();
loginUser = tKzyUserMapper.selectByPrimaryKey(loginUser.getId());
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM");
SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd");
Map<String, Object> param = new HashMap<String, Object>(); Map<String, Object> param = new HashMap<String, Object>();
...@@ -124,29 +124,18 @@ public class UserServiceImpl implements UserService { ...@@ -124,29 +124,18 @@ public class UserServiceImpl implements UserService {
hasSignDay.add(ymd); hasSignDay.add(ymd);
} }
/*List<Map<String, Object>> daysList = new ArrayList<>();
Map<String, Object> flag = null;
for (String everyDay : dayList) {
flag = new HashMap<>();
flag.put("day", everyDay);
if (hasSignDay.contains(everyDay)) {
flag.put("signFlag", 1);
} else {
flag.put("signFlag", 0);
}
daysList.add(flag);
}*/
Map<String, Object> param2 = new HashMap<String, Object>(); Map<String, Object> param2 = new HashMap<String, Object>();
param2.put("userId", loginUser.getId()); param2.put("userId", loginUser.getId());
param2.put("today", simpleDateFormat2.format(new Date())); param2.put("today", simpleDateFormat2.format(new Date()));
Map<String, Object> todaySign = integralMapper.queryDaySign(param2); Map<String, Object> todaySign = integralMapper.queryDaySign(param2);
Map<String, Object> dataMap = new HashMap<>(); Map<String, Object> dataMap = new HashMap<>();
dataMap.put("list", list); dataMap.put("list", list);
dataMap.put("todaySign", todaySign); dataMap.put("todaySign", todaySign);
dataMap.put("daysList", hasSignDay); dataMap.put("daysList", hasSignDay);
dataMap.put("integral", loginUser.getIntegral());
return ResultMapUtil.returnMap("1", "", dataMap); return ResultMapUtil.returnMap("1", "", dataMap);
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!