修改添加收藏，住过前面有null的问题

mhotel/src/com/happy/action/AppMePageAction.java

@@ -65,7 +65,8 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
 
     private String userCode; // 第一次进来获取用户的code
     private String queryValue; // 首页查寻搜索关键词
-    public  String type; // 类型：收藏、住过
+    public String type; // 类型：收藏、住过
+
     public HttpServletRequest getRequest() {
         return request;
     }
@@ -111,28 +112,27 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
     }
 
 
-
     /**
      * userId
      * 进入我的，查询订单列表
+     *
      * @return
      */
-    public String getBookingList()
-    {
+    public String getBookingList() {
         if (Func.checkNull(userId))
             return null;
         // 通过用户id查询所有订单列表数据
 
         StringBuilder querySql = new StringBuilder("");
         querySql.append(" and status_del = 1");
-        if (!Func.checkNull(userId)){
+        if (!Func.checkNull(userId)) {
             querySql.append(" and create_userid = '").append(userId).append("' ");
         }
 
         IPage<Booking> iPage = bookService.queryPage(querySql.toString(), page, rows);
-        List<Booking> bookList =iPage.getPageList();
-        if(bookList!=null){
-            for (Booking book: bookList) {
+        List<Booking> bookList = iPage.getPageList();
+        if (bookList != null) {
+            for (Booking book : bookList) {
                 if (book == null || Func.checkNull(book.getHouseId()))
                     continue;
 
@@ -142,7 +142,7 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
             }
         }
 
-        ResponseUtil.writeJsonIPage(ServletActionContext.getResponse(),iPage);
+        ResponseUtil.writeJsonIPage(ServletActionContext.getResponse(), iPage);
         return null;
     }
 
@@ -150,10 +150,10 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
      * 收藏、住过的酒店列表
      * userId
      * type  收藏、住过
+     *
      * @return
      */
-    public String getHotelAndUsersList()
-    {
+    public String getHotelAndUsersList() {
         if (Func.checkNull(userId) || Func.checkNull(type))
             return null;
 
@@ -168,25 +168,23 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
         if (!Func.checkNull(users.getLive_hotel()))
             liveList = Arrays.asList(users.getLive_hotel().split(","));
 
-        IPage<Hotel>  iPage = new IPage<>();
-        if (TempEnum.收藏.name().equals(type))
-        {
-            iPage = appHomePageService.getHotelList(collectList,page,rows);
-        }else if (TempEnum.住过.name().equals(type))
-        {
-            iPage = appHomePageService.getHotelList(liveList,page,rows);
+        IPage<Hotel> iPage = new IPage<>();
+        if (TempEnum.收藏.name().equals(type)) {
+            iPage = appHomePageService.getHotelList(collectList, page, rows);
+        } else if (TempEnum.住过.name().equals(type)) {
+            iPage = appHomePageService.getHotelList(liveList, page, rows);
         }
 
-        ResponseUtil.writeJsonIPage(ServletActionContext.getResponse(),iPage);
+        ResponseUtil.writeJsonIPage(ServletActionContext.getResponse(), iPage);
         return null;
     }
 
     /**
      * 通过订单id查订单数据
+     *
      * @return
      */
-    public String getBookingById()
-    {
+    public String getBookingById() {
         if (Func.checkNull(bookingId))
             return null;
         // 通过用户id查询所有订单列表数据
@@ -194,7 +192,7 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
         Booking book = bookService.getById(Func.parseInt(bookingId));
         if (book == null) {
             resultJson.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
-            resultJson.put(B.message,"查无此数据");
+            resultJson.put(B.message, "查无此数据");
             return null;
         }
 
@@ -202,11 +200,10 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
         // 数据字典写入book
         Map dicMap = hotelService.queryHotelDicMap();
         // 酒店配置列表数据填充
-        if (!Func.checkNull(book.getHotelConfig()))
-        {
+        if (!Func.checkNull(book.getHotelConfig())) {
             List<String> list = Arrays.asList(book.getHotelConfig().split(","));
             List hotelDicList = new ArrayList();
-            for (String hotelDicId:list) {
+            for (String hotelDicId : list) {
                 if (!dicMap.containsKey(Func.parseInt(hotelDicId)))
                     continue;
 
@@ -215,11 +212,10 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
             book.setHotelConfigList(hotelDicList);
         }
         // 房型配置列表数据填充
-        if (!Func.checkNull(book.getHouseConfig()))
-        {
+        if (!Func.checkNull(book.getHouseConfig())) {
             List<String> list = Arrays.asList(book.getHouseConfig().split(","));
             List houseDicList = new ArrayList();
-            for (String hotelDicId:list) {
+            for (String hotelDicId : list) {
                 if (!dicMap.containsKey(Func.parseInt(hotelDicId)))
                     continue;
 
@@ -233,9 +229,9 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
         book.setHouseFileInfoList(fileInfoList);
 
         resultJson.put(B.code, ResultStatusCode.OK.getStatus());
-        resultJson.put(B.message,ResultStatusCode.OK.getMsg());
-        resultJson.put(B.data,book);
-        ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
+        resultJson.put(B.message, ResultStatusCode.OK.getMsg());
+        resultJson.put(B.data, book);
+        ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
         return null;
     }
 
@@ -244,45 +240,42 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
      * userId 当前用户id，获取列表
      * 进入我的页面，跳转常用旅客列表
      */
-    public void getUserContactList()
-    {
+    public void getUserContactList() {
         // 通过用户id查询所有订单列表数据
         if (Func.checkNull(userId))
             return;
 
         StringBuilder querySql = new StringBuilder("");
-        if (!Func.checkNull(userId)){
+        if (!Func.checkNull(userId)) {
             querySql.append(" and contact_id = '").append(userId).append("' ");
         }
         querySql.append(" and data_type = '").append(DataType.关联数据.toString()).append("' ");
 
         IPage listPage = userService.queryUserPage(querySql.toString(), page, rows); // 查询分页
-        ResponseUtil.writeJsonIPage(ServletActionContext.getResponse(),listPage);
+        ResponseUtil.writeJsonIPage(ServletActionContext.getResponse(), listPage);
     }
 
     /**
      * 用户点击设置按钮，获取数据
      * 通过用户id查询用户信息
      */
-    public void queryUsersById()
-    {
+    public void queryUsersById() {
         if (Func.checkNull(userId))
             return;
         Users users = userService.queryByUserId(userId);
 
         JSONObject resultJson = new JSONObject();
         resultJson.put(B.code, ResultStatusCode.OK.getStatus());
-        resultJson.put(B.message,ResultStatusCode.OK.getMsg());
-        resultJson.put(B.data,users);
-        ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
+        resultJson.put(B.message, ResultStatusCode.OK.getMsg());
+        resultJson.put(B.data, users);
+        ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
 
     }
 
     /**
      * 通过UserId进行更改或添加数据
      */
-    public void updateContact()
-    {
+    public void updateContact() {
         if (Func.checkNull(contactId))
             return;
 
@@ -290,9 +283,9 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
         Users users = userService.queryByUserId(contactId);
         if (users == null) {
 
-            resultJson.put(B.code,ResultStatusCode.BAD_REQUEST.getStatus());
-            resultJson.put(B.message,"无此用户数据，请重新查询");
-            ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
+            resultJson.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            resultJson.put(B.message, "无此用户数据，请重新查询");
+            ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return;
         }
 
@@ -319,16 +312,15 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
         users.setCard_number(contactUserIdNum);
         userService.update(users);
 
-        resultJson.put(B.code,ResultStatusCode.OK.getStatus());
-        resultJson.put(B.message,ResultStatusCode.OK.getMsg());
-        ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
+        resultJson.put(B.code, ResultStatusCode.OK.getStatus());
+        resultJson.put(B.message, ResultStatusCode.OK.getMsg());
+        ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
     }
 
     /**
      * 添加常用联系人数据
      */
-    public void AddContact()
-    {
+    public void AddContact() {
         if (Func.checkNullOrEmpty(userId))
             return;
 
@@ -344,26 +336,24 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
         userService.insert(users);
 
         JSONObject resultJson = new JSONObject();
-        resultJson.put(B.code,ResultStatusCode.OK.getStatus());
-        resultJson.put(B.message,ResultStatusCode.OK.getMsg());
-        ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
+        resultJson.put(B.code, ResultStatusCode.OK.getStatus());
+        resultJson.put(B.message, ResultStatusCode.OK.getMsg());
+        ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
     }
 
     /**
      * 用户点击保存，更新用户信息
      */
-    public void updateUserInfo()
-    {
+    public void updateUserInfo() {
         if (Func.checkNullOrEmpty(userId))
             return;
 
         JSONObject resultJson = new JSONObject();
         Users users = userService.queryByUserId(userId);
-        if (users == null)
-        {
-            resultJson.put(B.code,ResultStatusCode.BAD_REQUEST.getStatus());
-            resultJson.put(B.message,"查无此用户数据，请先授权!");
-            ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
+        if (users == null) {
+            resultJson.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            resultJson.put(B.message, "查无此用户数据，请先授权!");
+            ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return;
         }
 
@@ -372,9 +362,9 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
         users.setDataType(DataType.游客数据.toString());
         userService.update(users);
 
-        resultJson.put(B.code,ResultStatusCode.OK.getStatus());
-        resultJson.put(B.message,ResultStatusCode.OK.getMsg());
-        ResponseUtil.writeJson(ServletActionContext.getResponse(),resultJson.toString());
+        resultJson.put(B.code, ResultStatusCode.OK.getStatus());
+        resultJson.put(B.message, ResultStatusCode.OK.getMsg());
+        ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
         return;
     }
 
@@ -382,24 +372,22 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
      * contactId
      * 用户可以删除自己相关联系人
      */
-    public void delContact()
-    {
+    public void delContact() {
         if (Func.checkNull(contactId))
             return;
 
         JSONObject resultJson = new JSONObject();
         userService.del(Func.parseInt(contactId));
 
-        resultJson.put(B.code,ResultStatusCode.OK.getStatus());
-        resultJson.put(B.message,ResultStatusCode.OK.getMsg());
+        resultJson.put(B.code, ResultStatusCode.OK.getStatus());
+        resultJson.put(B.message, ResultStatusCode.OK.getMsg());
         ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
     }
 
     /**
      * 判断是否有当前用户（加访问记录）
      */
-    public String isHaveUser()
-    {
+    public String isHaveUser() {
         if (Func.checkNull(this.code))
             return null;
 
@@ -417,10 +405,9 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
         String json = HttpsClient.sendPost(requestUrl, "");
         Wechat_userinfo result = new Gson().fromJson(json, Wechat_userinfo.class);
         OPEN_ID = result.getOpenid();
-        if (Func.checkNull(OPEN_ID))
-        {
-            resultJson.put(B.code,ResultStatusCode.BAD_REQUEST.getStatus());
-            resultJson.put(B.message,"未获取到OpenId");
+        if (Func.checkNull(OPEN_ID)) {
+            resultJson.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            resultJson.put(B.message, "未获取到OpenId");
             ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
         }
 
@@ -429,18 +416,17 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
          * 查询用户openid是否存在，存在就返回信息给前端，不存在就保存到数据库
          * */
         Users users = userService.queryByOpenid(OPEN_ID);
-        if (users == null)
-        {
-            resultJson.put(B.code,ResultStatusCode.BAD_REQUEST.getStatus());
-            resultJson.put(B.message," 当前用户未授权");
-            resultJson.put(B.data,users);
+        if (users == null) {
+            resultJson.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            resultJson.put(B.message, " 当前用户未授权");
+            resultJson.put(B.data, users);
             ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return null;
         }
 
-        resultJson.put(B.code,ResultStatusCode.OK.getStatus());
-        resultJson.put(B.message," 当前用户已授权");
-        resultJson.put(B.data,users);
+        resultJson.put(B.code, ResultStatusCode.OK.getStatus());
+        resultJson.put(B.message, " 当前用户已授权");
+        resultJson.put(B.data, users);
         ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
         return null;
 
@@ -449,8 +435,7 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
     /**
      * 用户登录小程序授权
      */
-    public void authorizationUser()
-    {
+    public void authorizationUser() {
         if (Func.checkNull(this.code))
             return;
 
@@ -458,41 +443,37 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
         JSONObject resultJson = new JSONObject();
         CodeEntity codeEntity = appService.getCodeInfo(code);
         OPEN_ID = codeEntity.getOpenid();
-            if (Func.checkNull(OPEN_ID))
-            {
-                resultJson.put(B.code,ResultStatusCode.BAD_REQUEST.getStatus());
-                resultJson.put(B.message,"未获取到OpenId");
-                ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
-            }
-
-            /*
-             *  手机号前端过来，昵称、省份、性别等其他信息已保存的result中，
-             * 查询用户openid是否存在，存在就返回信息给前端，不存在就保存到数据库
-             * */
-            Users users = userService.queryByOpenid(OPEN_ID);
-            if (users == null)
-            {
-                users = new Users();
-                // 确定默认用户名，默认用户头像
-                String userName = Func.parseStr(WxUtil.createDefaultUserName());
-                users.setUser_name(userName);
-                users.setHeadPhoto(ConstDefault.DefaultHeadPhoto);
-                users.setOpenid(OPEN_ID);
-                users.setCreate_time(DateUtil.getFormatPaternDate(new Date()));
-                users.setDataType(DataType.游客数据.toString());
-                userService.insert(users); // 写入用户数据
-
-                users = userService.queryByOpenid(OPEN_ID);
-            }
-
-            resultJson.put(B.code,ResultStatusCode.OK.getStatus());
-            resultJson.put(B.message,ResultStatusCode.OK.getMsg());
-            resultJson.put(B.data,users);
+        if (Func.checkNull(OPEN_ID)) {
+            resultJson.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
+            resultJson.put(B.message, "未获取到OpenId");
             ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
-            return ;
-    }
+        }
 
+        /*
+         *  手机号前端过来，昵称、省份、性别等其他信息已保存的result中，
+         * 查询用户openid是否存在，存在就返回信息给前端，不存在就保存到数据库
+         * */
+        Users users = userService.queryByOpenid(OPEN_ID);
+        if (users == null) {
+            users = new Users();
+            // 确定默认用户名，默认用户头像
+            String userName = Func.parseStr(WxUtil.createDefaultUserName());
+            users.setUser_name(userName);
+            users.setHeadPhoto(ConstDefault.DefaultHeadPhoto);
+            users.setOpenid(OPEN_ID);
+            users.setCreate_time(DateUtil.getFormatPaternDate(new Date()));
+            users.setDataType(DataType.游客数据.toString());
+            userService.insert(users); // 写入用户数据
+
+            users = userService.queryByOpenid(OPEN_ID);
+        }
 
+        resultJson.put(B.code, ResultStatusCode.OK.getStatus());
+        resultJson.put(B.message, ResultStatusCode.OK.getMsg());
+        resultJson.put(B.data, users);
+        ResponseUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+        return;
+    }
 
 
     public String getUserCode() {

mhotel/src/com/happy/service/impl/UserServiceImpl.java

@@ -87,7 +87,13 @@ public class UserServiceImpl implements UserService {
             throw new RuntimeException("无法查询到数据users-hotel");
 
         String live = users.getLive_hotel();
+        if (live==null) {
+            live="";
+        }
         String collect = users.getCollect_hotel();
+        if (collect==null) {
+            collect="";
+        }
         switch (type){
             case 住过:
                 if (Func.checkNull(live) || !live.contains(hotelId))