Merge branch 'wei_master' into '105'

update

See merge request !24

src/main/java/com/server/web/common/service/Impl/UserServiceImpl.java

@@ -109,7 +109,7 @@ public class UserServiceImpl implements UserService {
     @Override
     public Map<String, Object> signInList(TKzyUser loginUser) {
         //List<String> dayList = getDayListOfMonth();
-
+        loginUser = tKzyUserMapper.selectByPrimaryKey(loginUser.getId());
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM");
         SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd");
         Map<String, Object> param = new HashMap<String, Object>();
@@ -124,29 +124,18 @@ public class UserServiceImpl implements UserService {
             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>();
         param2.put("userId", loginUser.getId());
         param2.put("today", simpleDateFormat2.format(new Date()));
 
+
+
         Map<String, Object> todaySign = integralMapper.queryDaySign(param2);
         Map<String, Object> dataMap = new HashMap<>();
         dataMap.put("list", list);
         dataMap.put("todaySign", todaySign);
         dataMap.put("daysList", hasSignDay);
+        dataMap.put("integral", loginUser.getIntegral());
         return ResultMapUtil.returnMap("1", "", dataMap);
     }