修改接口bug

mhotel/src/com/happy/Model/AdminManager.java

@@ -16,6 +16,12 @@ public class AdminManager {
 	 */
 	private Integer id;
 
+
+	/**
+	 * 所属商家Id
+	 */
+	private Integer managerId;
+
 	/**
 	 * 账号
 	 */
@@ -92,10 +98,20 @@ public class AdminManager {
 	private Integer status;
 
 	/**
+	 * 备注
+	 */
+	private String remake;
+
+	/**
 	 * 营业执照
 	 */
 	private String fileListJson;
 
+	/**
+	 * 营业执照
+	 */
+	private List<File> fileList;
+
 	public Integer getId() {
 		return id;
 	}
@@ -104,6 +120,14 @@ public class AdminManager {
 		this.id = id;
 	}
 
+	public Integer getManagerId() {
+		return managerId;
+	}
+
+	public void setManagerId(Integer managerId) {
+		this.managerId = managerId;
+	}
+
 	public String getAdminName() {
 		return adminName;
 	}
@@ -224,6 +248,14 @@ public class AdminManager {
 		this.status = status;
 	}
 
+	public String getRemake() {
+		return remake;
+	}
+
+	public void setRemake(String remake) {
+		this.remake = remake;
+	}
+
 	public String getFileListJson() {
 		return fileListJson;
 	}
@@ -231,4 +263,12 @@ public class AdminManager {
 	public void setFileListJson(String fileListJson) {
 		this.fileListJson = fileListJson;
 	}
+
+	public List<File> getFileList() {
+		return fileList;
+	}
+
+	public void setFileList(List<File> fileList) {
+		this.fileList = fileList;
+	}
 }

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

@@ -3,10 +3,8 @@ package com.happy.action;
 import com.alibaba.fastjson.JSONArray;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import com.happy.Model.*;
 import com.happy.Model.AdminManager;
-import com.happy.Model.AdminManager;
-import com.happy.Model.AdminPower;
-import com.happy.Model.File;
 import com.happy.Until.GetHttpParam;
 import com.happy.Until.PwdDefind;
 import com.happy.Until.ResUtil;
@@ -15,6 +13,7 @@ import com.happy.dto.IPage;
 import com.happy.service.AdminManagerService;
 import com.happy.service.AdminService;
 import com.happy.service.FileService;
+import com.happy.service.HotelService;
 import com.opensymphony.xwork2.ActionSupport;
 import net.sf.json.JSONObject;
 import org.apache.struts2.ServletActionContext;
@@ -37,12 +36,17 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
     public AdminManagerService adminManagerService;
 
     @Resource
+    public HotelService hotelService;
+
+    @Resource
     public FileService fileService;
 
     public String adminName;
     public String password;
     public String hotelTownship;
+    public Integer managerId;//商户Id
     public Integer id;
+    public String level;//权限
     public int page; // 当前页
     public int rows;// 每页显示的行数rows
 
@@ -77,12 +81,26 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
                 .append(" and password = '").append(password).append("'");
         AdminManager login = adminManagerService.getOen(getOneSqlx.toString());
         if (login != null) {
-            login.setPassword("********");
-            resultJson.put("message", "登录成功");
-            resultJson.put("code", 200);
-            resultJson.put("data", login);
-            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
-            return null;
+            if(login.getStatus()==2){
+                resultJson.put("message", "账号已冻结请联系管理员");
+                resultJson.put("code", 205);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }else{
+                //是否主账号首次登录
+                Hotel hotel = hotelService.getOen("and manager_id = '"+login.getId()+"'");
+                if(hotel==null && hotel.getManagerId().equals(login.getId())){
+                    resultJson.put("isLogin",1);
+                }else{
+                    resultJson.put("isLogin",0);
+                }
+                login.setPassword("********");
+                resultJson.put("message", "登录成功");
+                resultJson.put("code", 200);
+                resultJson.put("data", login);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
         }
         resultJson.put("message", "用户名或密码错误");
         resultJson.put("code", 205);
@@ -135,6 +153,7 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
                 return null;
             }
             admin.setId(Math.toIntExact(UUIDUtil.generateID()));
+            admin.setManagerId(admin.getId());
             //保存详细图附件
             List<File> fileList = JSONArray.parseArray(admin.getFileListJson(), File.class);
             if(fileList!=null && fileList.size()>0){
@@ -196,7 +215,7 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
                 ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
                 return null;
             }
-            if (admin.getAdminName()==null || admin.getHotelName()==null || admin.getHotelTownship()==null
+            if (admin.getAdminName()==null || admin.getCorpnName()==null || admin.getHotelTownship()==null
                     || admin.getLevel()==null || admin.getCardName()==null || admin.getCorpnPhone()==null){
                 resultJson.put("message", "各参数不能为空");
                 resultJson.put("code", 500);
@@ -277,7 +296,7 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
                 ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
                 return null;
             }
-            if (admin.getAdminName()==null || admin.getCardName()==null || admin.getCorpnPhone()==null
+            if (admin.getAdminName()==null || admin.getCorpnName()==null || admin.getCorpnPhone()==null
                     || admin.getLevel()==null || admin.getPassword()==null){
                 resultJson.put("message", "各参数不能为空");
                 resultJson.put("code", 500);
@@ -523,7 +542,13 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
             s1.append(" and admin_name like '%").append(adminName).append("%'");
         }
         if (hotelTownship!=null){
-            s1.append(" and hotel_township like '%").append(hotelTownship).append("'");
+            s1.append(" and hotel_township = '").append(hotelTownship).append("'");
+        }
+        if(managerId!=null){
+            s1.append(" and manager_id = ").append(managerId);
+        }
+        if(level!=null){
+            s1.append(" and level = '").append(level).append("'");
         }
         IPage<AdminManager> adminIPage = adminManagerService.queryPage(s1.toString(),page,rows);
         if(adminIPage!=null && !"".equals(adminIPage)){
@@ -552,6 +577,8 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
             return null;
         }
         AdminManager admin = adminManagerService.getById(id);
+        List<File> fileList = fileService.queryList("and link_id ='"+id+"'");
+        admin.setFileList(fileList);
         if (admin != null) {
             resultJson.put("message", "查询成功");
             resultJson.put("code", 200);

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

@@ -43,6 +43,8 @@ public class AdminImplDao implements AdminDao {
         sps.addValue("status", 1);
         if(admin.getId()==null){
             sps.addValue("id", UUIDUtil.generateID());
+        }else{
+            sps.addValue("id", admin.getId());
         }
         int num = 0;
         try{

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

@@ -30,9 +30,10 @@ public class AdminManagerImplDao implements AdminManagerDao {
     @Override
     public int insertAdmin(AdminManager adminManager) {
 
-        String sql = "INSERT INTO admin_manager (id, admin_name, password, hotel_name, hotel_township, corpn_name, corpn_phone, level, admin_power, bank_card, card_name, bank_name, create_id, create_date, status) VALUES (:id, :admin_name, :password, :hotel_name, :hotel_township, :corpn_name, :corpn_phone, :level, :admin_power, :bank_card, :card_name, :bank_name, :create_id, :create_date, :status)";
+        String sql = "INSERT INTO admin_manager (id, manager_id, admin_name, password, hotel_name, hotel_township, corpn_name, corpn_phone, level, admin_power, bank_card, card_name, bank_name, create_id, create_date, status, remake) VALUES (:id, :admin_name, :password, :hotel_name, :hotel_township, :corpn_name, :corpn_phone, :level, :admin_power, :bank_card, :card_name, :bank_name, :create_id, :create_date, :status, :remake)";
 
         MapSqlParameterSource sps = new MapSqlParameterSource();
+        sps.addValue("manager_id", adminManager.getAdminName());
         sps.addValue("admin_name", adminManager.getAdminName());
         sps.addValue("password", adminManager.getPassword());
         sps.addValue("hotel_name", adminManager.getHotelName());
@@ -47,8 +48,11 @@ public class AdminManagerImplDao implements AdminManagerDao {
         sps.addValue("create_id", adminManager.getCreateId());
         sps.addValue("create_date",adminManager.getCreateDate());
         sps.addValue("status", 1);
+        sps.addValue("remake", adminManager.getRemake());
         if(adminManager.getId()==null){
             sps.addValue("id", UUIDUtil.generateID());
+        }else{
+            sps.addValue("id", adminManager.getId());
         }
         int num = 0;
         try{
@@ -63,7 +67,7 @@ public class AdminManagerImplDao implements AdminManagerDao {
     @Override
     public int updateAdmin(AdminManager adminManager) {
 
-        String sql = "UPDATE admin_manager SET admin_name = :admin_name, password = :password, hotel_name = :hotel_name, hotel_township = :hotel_township, corpn_name = :corpn_name, corpn_phone = :corpn_phone, level = :level, admin_power = :admin_power, bank_card = :bank_card, card_name = :card_name, bank_name = :bank_name, create_id = :create_id, modify_date =:modify_date, status =:status WHERE id = :id";
+        String sql = "UPDATE admin_manager SET admin_name = :admin_name, password = :password, hotel_name = :hotel_name, hotel_township = :hotel_township, corpn_name = :corpn_name, corpn_phone = :corpn_phone, level = :level, admin_power = :admin_power, bank_card = :bank_card, card_name = :card_name, bank_name = :bank_name, create_id = :create_id, modify_date =:modify_date, status =:status, remake =:remake WHERE id = :id";
 
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("admin_name", adminManager.getAdminName());
@@ -80,6 +84,7 @@ public class AdminManagerImplDao implements AdminManagerDao {
         sps.addValue("create_id", adminManager.getCreateId());
         sps.addValue("modify_date",adminManager.getModifyDate());
         sps.addValue("status", adminManager.getStatus());
+        sps.addValue("remake", adminManager.getRemake());
         sps.addValue("id",adminManager.getId());
         int num = 0;
         try{
@@ -124,7 +129,7 @@ public class AdminManagerImplDao implements AdminManagerDao {
     @Override
     public List<AdminManager> queryPage(String sqlx, int page, int rows) {
         int start = (page - 1) * rows;// 每页的起始下标
-        String sql = "SELECT * FROM `admin_manager` WHERE status=1 "+sqlx+" ORDER BY id DESC limit :start,:rows ";
+        String sql = "SELECT * FROM `admin_manager` WHERE status!=0 "+sqlx+" ORDER BY id DESC limit :start,:rows ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("start", start);
         sps.addValue("rows", rows);
@@ -136,14 +141,14 @@ public class AdminManagerImplDao implements AdminManagerDao {
 
     @Override
     public int queryTotal(String sqlx) {
-        String sql = "SELECT count(*) FROM`admin_manager` where status=1 "+sqlx;
+        String sql = "SELECT count(*) FROM`admin_manager` where status!=0 "+sqlx;
         MapSqlParameterSource sps = new MapSqlParameterSource();
         return namedParameterJdbcTemplate.queryForInt(sql, sps);
     }
 
     @Override
     public List<AdminManager> queryList(String sqlx) {
-        String sql = "SELECT * FROM `admin_manager` WHERE status=1 "+sqlx;
+        String sql = "SELECT * FROM `admin_manager` WHERE status!=0 "+sqlx;
         List<AdminManager> list = null;
         try{
             list = namedParameterJdbcTemplate.query(sql, new BeanPropertyRowMapper<>(AdminManager.class));

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

@@ -40,6 +40,8 @@ public class HotelDictImplDao implements HotelDictDao {
         sps.addValue("status",1);
         if(hotelDict.getId()==null){
             sps.addValue("id", UUIDUtil.generateID());
+        }else{
+            sps.addValue("id",  hotelDict.getId());
         }
         int num = 0;
         try{

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

@@ -54,6 +54,8 @@ public class HotelImplDao implements HotelDao {
         sps.addValue("status", 1);
         if(hotel.getId()==null){
             sps.addValue("id", UUIDUtil.generateID());
+        }else{
+            sps.addValue("id", hotel.getId());
         }
         int num = 0;
         try{

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

@@ -43,6 +43,9 @@ public class HouseImplDao implements HouseDao {
         sps.addValue("status",house.getStatus());
         if(house.getId()==null){
             sps.addValue("id", UUIDUtil.generateID());
+        }else{
+            sps.addValue("id", house.getId());
+
         }
         int num = 0;
         try{

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

@@ -87,4 +87,11 @@ public interface BookService {
      * @return
      */
     String delBooking(String bookingId);
+
+    /**
+     * 描述：根据订单号获取订单
+     * @param orderNum
+     * @return
+     */
+    Booking queryByOrder(String orderNum);
 }

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

@@ -11,6 +11,7 @@ import com.happy.service.BookService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.awt.print.Book;
 import java.util.Date;
 import java.util.List;
 
@@ -116,4 +117,13 @@ public class BookImplService implements BookService {
         bookDao.updateBooking(book);
         return null;
     }
+
+    @Override
+    public Booking queryByOrder(String orderNum) {
+        List<Booking> list = bookDao.queryList("and order_num = '"+orderNum+"'");
+        if(list!=null && list.size()>0) return list.get(0);
+        return null;
+    }
+
+
 }