修改bug

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

@@ -105,7 +105,7 @@ public class AdminManager {
 	/**
 	 * 营业执照
 	 */
-	private List<File> fileList;
+	private List<FileInfo> fileInfoList;
 	public String openid;
 
 	public Integer getId() {
@@ -252,12 +252,12 @@ public class AdminManager {
 		this.remark = remark;
 	}
 
-	public List<File> getFileList() {
-		return fileList;
+	public List<FileInfo> getFileInfoList() {
+		return fileInfoList;
 	}
 
-	public void setFileList(List<File> fileList) {
-		this.fileList = fileList;
+	public void setFileInfoList(List<FileInfo> fileInfoList) {
+		this.fileInfoList = fileInfoList;
 	}
 
 	public String getOpenid() {

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

@@ -81,31 +81,61 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
         Booking book = bookService.getById(id);
         //获取用户openId
         Users user = userService.queryByUserId(book.getCreateUserid());
+        if(user.getOpenid()==null){
+            resultJson.put("message", "用户openId为空，请用户授权才能操作。");
+            resultJson.put("code", 502);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
+        String msg = "";
+        String sendMsg = "";
         try{
             switch (type){
                 case 1://接单
+                    if(book.getOrderStatus()!=""){
+
+                    }
                     book.setOrderStatus("3");
-                    //推送信息
-                    Message.send(user.getOpenid(),book.getOrderNum(),book.getUserName(),"商家已接单",book.getCreateTime());
+                    msg = "接单";
+                    sendMsg = "商家已接单";
                     break;
                 case 2://入住
                     book.setOrderStatus("4");
+                    msg = "入住办理";
                     break;
                 case 3://退房
                     book.setOrderStatus("5");
+                    msg = "退房";
                     break;
                 case 4://退单
                     book.setOrderStatus("8");
+                    msg = "退单";
                     break;
                 case 5://退款
                     book.setOrderStatus("9");
+                    msg = "退款";
                     break;
             }
+            int m = bookService.updateBooking(book);
+            if (m > 0) {
+                //推送信息
+                Message.send(user.getOpenid(),book.getOrderNum(),book.getUserName(),sendMsg,book.getCreateTime());
+                resultJson.put("message", msg+"成功");
+                resultJson.put("code", 200);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            } else {
+                resultJson.put("message", msg+"失败");
+                resultJson.put("code", 502);
+                ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                return null;
+            }
         }catch (Exception e){
-
+            e.printStackTrace();
         }
-
-        bookService.updateBooking(book);
+        resultJson.put("message", "未知异常");
+        resultJson.put("code", 205);
+        ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
         return null;
     }
 
@@ -118,9 +148,9 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
         StringBuilder s1 = new StringBuilder("");
         s1.append(" and hotel_manager_id = '").append(managerId).append("'");
         if (ledgerParam!=null){
-            s1.append(" and (order_num like '%").append(ledgerParam).append("'")
-                    .append(" or user_name like '%").append(ledgerParam).append("'")
-                    .append(" or user_phone like '%").append(ledgerParam).append("')");
+            s1.append(" and (order_num like '%").append(ledgerParam).append("%'")
+                    .append(" or user_name like '%").append(ledgerParam).append("%'")
+                    .append(" or user_phone like '%").append(ledgerParam).append("%')");
         }
         if(orderStatus!=null){
             s1.append(" and order_status = ").append(orderStatus);
@@ -154,10 +184,11 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
     public String toBookExcel() {
         JSONObject resultJson = new JSONObject();
         StringBuilder s1 = new StringBuilder("");
+        s1.append(" and hotel_manager_id = '").append(managerId).append("'");
         if (ledgerParam!=null){
-            s1.append(" and (order_num like '%").append(ledgerParam).append("'")
-                    .append(" or user_name like '%").append(ledgerParam).append("'")
-                    .append(" or user_phone like '%").append(ledgerParam).append("')");
+            s1.append(" and (order_num like '%").append(ledgerParam).append("%'")
+                    .append(" or user_name like '%").append(ledgerParam).append("%'")
+                    .append(" or user_phone like '%").append(ledgerParam).append("%')");
         }
         if(orderStatus!=null){
             s1.append(" and order_status = ").append(orderStatus);
@@ -225,11 +256,11 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
         JSONObject resultJson = new JSONObject();
         StringBuilder s1 = new StringBuilder("");
         s1.append(" and order_status = 5");
-        s1.append(" and hotel_manager_id like '%").append(managerId).append("'");
+        s1.append(" and hotel_manager_id = '").append(managerId).append("'");
         if (ledgerParam!=null){
-            s1.append(" and (order_num like '%").append(ledgerParam).append("'")
-                .append(" or user_name like '%").append(ledgerParam).append("'")
-                .append(" or user_phone like '%").append(ledgerParam).append("')");
+            s1.append(" and (order_num like '%").append(ledgerParam).append("%'")
+                .append(" or user_name like '%").append(ledgerParam).append("%'")
+                .append(" or user_phone like '%").append(ledgerParam).append("%')");
         }
         if(payStartTime!=null && payEndTime!=null){
             s1.append(" and pay_time >= '").append(payStartTime).append("'")
@@ -296,11 +327,11 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
         JSONObject resultJson = new JSONObject();
         StringBuilder s1 = new StringBuilder("");
         s1.append(" and order_status = 5");
-        s1.append(" and hotel_manager_id like '%").append(managerId).append("'");
+        s1.append(" and hotel_manager_id = '").append(managerId).append("'");
         if (ledgerParam!=null){
-            s1.append(" and (order_num like '%").append(ledgerParam).append("'")
-                    .append(" or user_name like '%").append(ledgerParam).append("'")
-                    .append(" or user_phone like '%").append(ledgerParam).append("')");
+            s1.append(" and (order_num like '%").append(ledgerParam).append("%'")
+                    .append(" or user_name like '%").append(ledgerParam).append("%'")
+                    .append(" or user_phone like '%").append(ledgerParam).append("%')");
         }
         if(payStartTime!=null && payEndTime!=null){
             s1.append(" and pay_time >= '").append(payStartTime).append("'")

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

@@ -31,7 +31,7 @@ public class AdminImplDao implements AdminDao {
 
     @Override
     public int insertAdmin(Admin admin){
-        String sql = "insert into admin(id,admin_name,user_name,phone,password,level,admin_power,remark, create_id, create_date, status) values(:id,:admin_name,:user_name,:phone,:password,:level,:admin_power,:remark, :create_id, :create_date, :status) ";
+        String sql = "insert into admin(id,admin_name,user_name,phone,password,level,admin_power,remark, create_id, create_date, status ) values(:id,:admin_name,:user_name,:phone,:password,:level,:admin_power,:remark, :create_id, :create_date, :status) ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("admin_name", admin.getAdminName());
         sps.addValue("user_name",admin.getUserName());
@@ -107,7 +107,7 @@ public class AdminImplDao implements AdminDao {
     @Override
     public List<Admin> queryPage(String sqlx, int page, int rows) {
         int start = (page - 1) * rows;// 每页的起始下标
-        String sql = "select * from `admin` where status=1 "+sqlx+" order by id desc limit :start,:rows ";
+        String sql = "select id,admin_name,password,user_name,phone,level,admin_power,remark,create_id, DATE_FORMAT(create_date,'%Y-%m-%d %T') create_date,DATE_FORMAT(modify_date,'%Y-%m-%d %T') modify_date,status,openid from `admin` where status=1 "+sqlx+" order by id desc limit :start,:rows ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("start", start);
         sps.addValue("rows", rows);

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

@@ -182,7 +182,7 @@ public class BookImplDao implements BookDao {
     @Override
     public List<Booking> queryPage(String sqlx, int page, int rows) {
         int start = (page - 1) * rows;// 每页的起始下标
-        String sql = "SELECT * FROM `booking` WHERE is_delete=2 "+sqlx+" ORDER BY id DESC,pay_time DESC limit :start,:rows ";
+        String sql = "SELECT * FROM `booking` WHERE is_delete=1 "+sqlx+" ORDER BY id DESC,pay_time DESC limit :start,:rows ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("start", start);
         sps.addValue("rows", rows);
@@ -214,7 +214,7 @@ public class BookImplDao implements BookDao {
 
     @Override
     public Double sumAccount(String sqlx){
-        String sql = "select sum(pay_account) pay_account from booking where is_delete=2"+sqlx;
+        String sql = "select sum(pay_account) pay_account from booking where is_delete=1"+sqlx;
         List<Booking> list = null;
         try{
             list = namedParameterJdbcTemplate.query(sql, new BeanPropertyRowMapper<>(Booking.class));