Merge remote-tracking branch 'origin/master'

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

@@ -3,6 +3,7 @@ package com.happy.action;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.happy.Model.Admin;
+import com.happy.Model.AdminManager;
 import com.happy.Model.AdminPower;
 import com.happy.Until.GetHttpParam;
 import com.happy.Until.PwdDefind;
@@ -62,8 +63,13 @@ public class adminAction extends ActionSupport implements ServletRequestAware {
         StringBuilder getOneSqlx = new StringBuilder("");
         getOneSqlx.append(" and admin_name = '").append(adminName).append("'");
         Admin login = adminService.getOen(getOneSqlx.toString());
+
+        StringBuilder getOneSqlx1 = new StringBuilder("");
+        getOneSqlx1.append(" and admin_name = '").append(adminName).append("'")
+                .append(" and password = '").append(password).append("'");
+        Admin login1 = adminService.getOen(getOneSqlx1.toString());
         if (login != null) {
-            if(!login.getPassword().equals(password)){
+            if(login1 == null){
                 resultJson.put("message", "用户名或密码错误");
                 resultJson.put("code", 205);
                 ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());

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

@@ -82,8 +82,13 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
         StringBuilder getOneSqlx = new StringBuilder("");
         getOneSqlx.append(" and admin_name = '").append(adminName).append("'");
         AdminManager login = adminManagerService.getOen(getOneSqlx.toString());
+
+        StringBuilder getOneSqlx1 = new StringBuilder("");
+        getOneSqlx1.append(" and admin_name = '").append(adminName).append("'")
+                .append(" and password = '").append(password).append("'");
+        AdminManager login1 = adminManagerService.getOen(getOneSqlx1.toString());
         if (login != null) {
-            if(!login.getPassword().equals(password)){
+            if(login1 == null){
                 resultJson.put("message", "用户名或密码错误");
                 resultJson.put("code", 205);
                 ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
@@ -435,8 +440,29 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return null;
         }
+        AdminManager admin = adminManagerService.getById(id);
         int m = adminManagerService.delAdmin(id);
         if (m > 0) {
+            //冻结旗下所有民宿、账号
+            if(admin.getManagerId()!=null){
+                //民宿
+                Hotel hotel = hotelService.getByManagerId(admin.getManagerId());
+                if(hotel!=null){
+                    hotel.setStatus(0);
+                    hotelService.updateHotel(hotel);
+                }
+                //员工账号
+                StringBuilder managersql = new StringBuilder("");
+                managersql.append(" and manager_id = '").append(admin.getManagerId()).append("'");
+                managersql.append(" and level = 1 ");
+                List<AdminManager> managerList = adminManagerService.queryList(managersql.toString());
+                if(managerList!=null){
+                    for(AdminManager manager : managerList){
+                        manager.setStatus(0);
+                        adminManagerService.updateAdmin(manager);
+                    }
+                }
+            }
             resultJson.put("message", "删除成功");
             resultJson.put("code", 200);
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
@@ -495,6 +521,26 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
         }
         AdminManager admin = adminManagerService.getById(id);
         if (admin != null && !"".equals(admin)) {
+            //冻结旗下所有民宿、账号
+            if(admin.getManagerId()!=null){
+                //民宿
+                Hotel hotel = hotelService.getByManagerId(admin.getManagerId());
+                if(hotel!=null){
+                    hotel.setStatus(2);
+                    hotelService.updateHotel(hotel);
+                }
+                //员工账号
+                StringBuilder managersql = new StringBuilder("");
+                managersql.append(" and manager_id = '").append(admin.getManagerId()).append("'");
+                managersql.append(" and level = 1 ");
+                List<AdminManager> managerList = adminManagerService.queryList(managersql.toString());
+                if(managerList!=null){
+                    for(AdminManager manager : managerList){
+                        manager.setStatus(2);
+                        adminManagerService.updateAdmin(manager);
+                    }
+                }
+            }
             admin.setStatus(2);
             int m = adminManagerService.updateAdmin(admin);
             if(m > 0){
@@ -528,6 +574,26 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
         }
         AdminManager admin = adminManagerService.getById(id);
         if (admin != null && !"".equals(admin)) {
+            //冻结旗下所有民宿、账号
+            if(admin.getManagerId()!=null){
+                //民宿
+                Hotel hotel = hotelService.getByManagerId(admin.getManagerId());
+                if(hotel!=null){
+                    hotel.setStatus(1);
+                    hotelService.updateHotel(hotel);
+                }
+                //员工账号
+                StringBuilder managersql = new StringBuilder("");
+                managersql.append(" and manager_id = '").append(admin.getManagerId()).append("'");
+                managersql.append(" and level = 1 ");
+                List<AdminManager> managerList = adminManagerService.queryList(managersql.toString());
+                if(managerList!=null){
+                    for(AdminManager manager : managerList){
+                        manager.setStatus(1);
+                        adminManagerService.updateAdmin(manager);
+                    }
+                }
+            }
             admin.setStatus(1);
             int m = adminManagerService.updateAdmin(admin);
             if(m > 0){

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

@@ -114,8 +114,9 @@ public class houseAction extends ActionSupport implements ServletRequestAware {
             int m = houseService.insertHouse(house);
             if (m > 0) {
                 for(FileInfo file : fileList){
+                    FileInfo fileInfo = fileService.getById(file.getId());
                     file.setLinkId(house.getId());
-                    if(file==null){
+                    if(fileInfo==null){
                         fileService.insertFile(file);
                     }else{
                         fileService.updateFile(file);

mhotel/src/com/happy/dao/HotelDao.java

@@ -35,6 +35,13 @@ public interface HotelDao {
     Hotel getById(int id);
 
     /**
+     * 描述：根据managerId查询详细
+     * @param id
+     * @return
+     */
+    Hotel getByManagerId(int id);
+
+    /**
      * 描述：分页查询
      * @param sqlx
      * @param page

mhotel/src/com/happy/dao/impl/HotelImplDao.java

@@ -123,6 +123,26 @@ public class HotelImplDao implements HotelDao {
     }
 
     @Override
+    public Hotel getByManagerId(int id) {
+
+        String sql = " SELECT   a.*, c.manager_phone, b.hotel_township_name  FROM `hotel` a  " +
+                " LEFT JOIN (SELECT   manager_id, corpn_phone manager_phone, hotel_township FROM  admin_manager  GROUP BY  manager_id) c ON a.manager_id = c.manager_id " +
+                " LEFT JOIN (  SELECT  id,name as hotel_township_name  FROM  hotel_dict GROUP BY  id) b ON b.id = c.hotel_township   "+
+                " WHERE  a.STATUS = 1  AND a.manager_id =  :manager_id ";
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        sps.addValue("manager_id",id);
+        List<Hotel> list = null;
+        try{
+            list = namedParameterJdbcTemplate.query(sql, sps,
+                    new BeanPropertyRowMapper<>(Hotel.class));
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        if(list != null && list.size()>0) return list.get(0);
+        return null;
+    }
+
+    @Override
     public List<Hotel> queryPage(String sqlx, int page, int rows) {
         int start = (page - 1) * rows;// 每页的起始下标
         String sql = "SELECT * FROM `hotel` WHERE status=1 "+sqlx+" ORDER BY id DESC limit :start,:rows ";

mhotel/src/com/happy/service/HotelService.java

@@ -38,6 +38,13 @@ public interface HotelService {
     Hotel getById(int id);
 
     /**
+     * 描述：根据managerId查询详细
+     * @param id
+     * @return
+     */
+    Hotel getByManagerId(int id);
+
+    /**
      * 描述：分页查询
      * @param sqlx
      * @param page
@@ -66,7 +73,8 @@ public interface HotelService {
      * 获取酒店配置字典map
      * @return
      */
-    public Map queryHotelDicMap();
+    Map queryHotelDicMap();
+
     /**
      * 描述：查询一条数据
      * @param sqlx

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

@@ -43,6 +43,11 @@ public class HotelImplService implements HotelService {
     }
 
     @Override
+    public Hotel getByManagerId(int id) {
+        return hotelDao.getByManagerId(id);
+    }
+
+    @Override
     public IPage<Hotel> queryPage(String sqlx, int page, int rows) {
         IPage<Hotel> iPage = new IPage();
         List<Hotel> hotelList = hotelDao.queryPage(sqlx,page,rows);