修改信息维护方法

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

@@ -14,7 +14,7 @@ public class Booking {
   private String userName;//住客姓名
   private String userPhone;// 住客手机号
   private String hotelId;// 民宿id
-  private String hotelManagerId;//所属商户Id
+  private Integer hotelManagerId;//所属商户Id
   private String hotelName;// 民宿名称
   private String hotelHposition; // 民宿位置
   private String hotelHpositionWens; // 民宿经纬度
@@ -408,11 +408,11 @@ public class Booking {
     this.remake = remake;
   }
 
-  public String getHotelManagerId() {
+  public Integer getHotelManagerId() {
     return hotelManagerId;
   }
 
-  public void setHotelManagerId(String hotelManagerId) {
+  public void setHotelManagerId(Integer hotelManagerId) {
     this.hotelManagerId = hotelManagerId;
   }
 

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

@@ -19,7 +19,7 @@ public class Hotel {
 	/**
 	 * 所属商家Id
 	 */
-	private String managerId;
+	private Integer managerId;
 
 	/**
 	 * 封面图
@@ -150,11 +150,11 @@ public class Hotel {
 		this.id = id;
 	}
 
-	public String getManagerId() {
+	public Integer getManagerId() {
 		return managerId;
 	}
 
-	public void setManagerId(String managerId) {
+	public void setManagerId(Integer managerId) {
 		this.managerId = managerId;
 	}
 

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

@@ -19,7 +19,7 @@ public class House {
 	/**
 	 * 所属商家Id
 	 */
-	private String managerId;
+	private Integer managerId;
 
 	/**
 	 * 房型名称
@@ -87,11 +87,11 @@ public class House {
 		this.id = id;
 	}
 
-	public String getManagerId() {
+	public Integer getManagerId() {
 		return managerId;
 	}
 
-	public void setManagerId(String managerId) {
+	public void setManagerId(Integer managerId) {
 		this.managerId = managerId;
 	}
 

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

@@ -155,7 +155,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
             if (m > 0) {
                 //推送信息
                 if(!"".equals(sendMsg)){
-                    Message.send(user.getOpenid(),book.getOrderNum(),book.getUserName(),sendMsg,book.getCreateTime());
+                    Message.send(user.getOpenid(),book.getOrderNum(),book.getUserName(),sendMsg,book.getCreateTime().substring(0,10));
                 }
                 resultJson.put("message", msg+"成功");
                 resultJson.put("code", 200);

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

@@ -95,7 +95,8 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
                 return null;
             }
             //保存基本信息
-            if(hotel.getId()!= null){
+            Hotel hotel1 = hotelService.getById(hotel.getId());
+            if(hotel1!= null){
                 m = hotelService.updateHotel(hotel);
             }else{
                 hotel.setId(hotelId);
@@ -158,7 +159,13 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
 
         HotelEto hotelEto = new HotelEto();
         if(adminManager!=null){
-            BeanUtils.copyProperties(adminManager,hotelEto);
+            hotelEto.setHotelName(adminManager.getHotelName());
+            hotelEto.setHotelTownship(adminManager.getHotelTownship());
+            hotelEto.setHotelTownshipName(adminManager.getHotelTownshipName());
+            hotelEto.setCorpnName(adminManager.getCorpnName());
+            hotelEto.setCorpnPhone(adminManager.getCorpnPhone());
+            hotelEto.setManagerId(adminManager.getId());
+            //hotelEto.setBankCard(adminManager.getBankCard());
         }
         if(hotel!=null){
             //获取有效民宿配置

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

@@ -163,7 +163,7 @@ public class HouseImplDao implements HouseDao {
 
 
     private void appendValue(House house, StringBuffer stringBuffer, MapSqlParameterSource sps){
-        if (!Func.checkNull(house.getManagerId())){
+        if (!Func.checkNull(String.valueOf(house.getManagerId()))){
             stringBuffer.append(" manager_id=:manager_id ,");
             sps.addValue("manager_id",house.getManagerId());
         }

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

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Repository;
 import java.util.ArrayList;
 import java.util.List;
 
-@Repository("UsersDao")
+@Repository("UserDao")
 public class UserDaoImpl implements UserDao {
 
     @Autowired

mhotel/src/com/happy/dto/HotelEto.java

@@ -11,6 +11,8 @@ public class HotelEto extends Hotel {
 
     private String hotelTownship;//所属乡镇
 
+    private String hotelTownshipName;//所属乡镇名称
+
     private String corpnName;//法人名称
 
     private String corpnPhone;//法人电话

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

@@ -66,7 +66,6 @@ public class AppBookImplService implements AppBookService {
         booking.setHotelConfig(hotel.getHconfig());
         booking.setHotelType(hotel.getHtype());
         booking.setHotelIsCanorder(Func.parseStr(hotel.getIsCanorder()));
-        booking.setHotelManagerId(house.getManagerId());
         booking.setHotelPhone(adminManager.getCorpnPhone());
         booking.setHotelPerson(adminManager.getCorpnName());
         booking.setLockTime(hotel.getLockTime());

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

@@ -64,7 +64,7 @@ public class AppHomePageImplService implements AppHomePageService {
         if (Func.checkNull(hotelId))
             return new Hotel();
         Hotel hotel = hotelService.getById(Func.parseInt(hotelId));
-        if (hotel == null || Func.checkNull(hotel.getManagerId()))
+        if (hotel == null || Func.checkNull(String.valueOf(hotel.getManagerId())))
             return hotel;
 
         // 数据字典写入hotel