Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mhotel/src/struts.xml

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

@@ -126,6 +126,8 @@ public class Hotel {
 	 */
 	private Integer status;
 
+	private String min_price;
+
 	private List<House> houseList;
 
 	public Integer getId() {
@@ -319,4 +321,12 @@ public class Hotel {
 	public void setHouseList(List houseList) {
 		this.houseList = houseList;
 	}
+
+	public String getMin_price() {
+		return min_price;
+	}
+
+	public void setMin_price(String min_price) {
+		this.min_price = min_price;
+	}
 }

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

@@ -122,6 +122,17 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
     }
 
     /**
+     * 微信授权，进入页面
+     * @return
+     */
+    public String Authorization()
+    {
+        // TODO 微信授权，进入页面
+        return null;
+    }
+
+
+    /**
      * 通过酒店的id获取到房间信息
      * @return
      */

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

@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
-public class hotelAction extends ActionSupport implements ServletRequestAware {
+public class HotelAction extends ActionSupport implements ServletRequestAware {
 
     private HttpServletRequest request;
     public HttpServletResponse response;

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

@@ -45,6 +45,16 @@ public interface HotelDao {
 
 
     /**
+     * 描述：分页查询,加最低价格
+     * @param sqlx
+     * @param page
+     * @param rows
+     * @return
+     */
+    List<Hotel> queryPagePrice(String sqlx, int page, int rows);
+
+
+    /**
      * 描述：获取总条数
      * @param sqlx
      * @return

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

@@ -145,6 +145,22 @@ public class HotelImplDao implements HotelDao {
         return null;
     }
 
+//    select a.*,b.min_price from hotel a
+//    left join (select manager_id,min(price) min_price from house group by manager_id) b on a.manager_id = b.manager_id  ORDER BY id DESC limit 1,3
+    @Override
+    public List<Hotel> queryPagePrice(String sqlx, int page, int rows) {
+        int start = (page - 1) * rows;// 每页的起始下标
+        String sql = "SELECT a.*,b.min_price FROM `hotel` a left join (select manager_id,min(price) min_price from house group by manager_id) b on a.manager_id = b.manager_id WHERE 1=1 "+sqlx+" ORDER BY id DESC limit :start,:rows ";
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        sps.addValue("start", start);
+        sps.addValue("rows", rows);
+        List<Hotel> list = namedParameterJdbcTemplate.query(sql, sps,
+                new BeanPropertyRowMapper<>(Hotel.class));
+        if (list != null && list.size() > 0) return list;
+        return null;
+    }
+
+
     @Override
     public int queryTotal(String sqlx) {
         String sql = "SELECT count(*) FROM`hotel` where status=1 "+sqlx;

mhotel/src/struts.xml

@@ -23,20 +23,17 @@
 		</action>
 		<action name="admin*" method = "{1}" class="com.happy.action.adminAction">
 		</action>
-		<action name="managerAdmin*" method = "{1}" class="com.happy.action.adminManagerAction">
-		</action>
 		<action name="config*" method = "{1}" class="com.happy.action.configAction">
 		</action>
-		<action name="hotel*" method = "{1}" class="com.happy.action.hotelAction">
-		</action>
 		<action name="house*" method = "{1}" class="com.happy.action.houseAction">
 		</action>
 		<action name="book*" method = "{1}" class="com.happy.action.bookAction">
 		</action>
 		<action name="app*" method = "{1}" class="com.happy.action.appAction">
 		</action>
-		<action name="upload*" method = "{1}" class="com.happy.action.uploadAction">
-		</action>
+		<action name="appMePage*" method = "{1}" class="com.happy.action.AppMePageAction"></action>
+		<action name="appHomePage*" method = "{1}" class="com.happy.action.AppHomePageAction"></action>
+		<action name="appBooking*" method = "{1}" class="com.happy.action.AppBookingAction"></action>
 	</package>
 	<package name="interfaces" namespace="/interfaces" extends="struts-default">
 		<!-- 接口总调度开始 -->