Merge branch 'master' of https://e.coding.net/chuanghaikeji/jinganxiangsu/Homestay_app_houtai

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

@@ -29,7 +29,7 @@ public class HousePriceAction extends BaseController implements ModelDriven<Hous
     /**
      * 房型ID
      */
-    public Integer roomId;
+    public String roomId;
     /**
      * 民宿商家ID
      */
@@ -43,11 +43,11 @@ public class HousePriceAction extends BaseController implements ModelDriven<Hous
      */
     public String endTime;
 
-    public Integer getRoomId() {
+    public String getRoomId() {
         return roomId;
     }
 
-    public void setRoomId(Integer roomId) {
+    public void setRoomId(String roomId) {
         this.roomId = roomId;
     }
 

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

@@ -112,5 +112,5 @@ public interface HouseDao {
      * @param houseId
      * @return
      */
-    Double queryPriceByHouseId(int houseId);
+    Double queryPriceByHouseId(String houseId);
 }

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

@@ -63,5 +63,5 @@ public interface HousePriceDao {
      * @param endTime
      * @return
      */
-    List<HousePriceDataVo> queryPriceByHouseId(Integer houseId, String startTime, String endTime);
+    List<HousePriceDataVo> queryPriceByHouseId(String houseId, String startTime, String endTime);
 }

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

@@ -218,7 +218,7 @@ public class HouseImplDao implements HouseDao {
     }
 
     @Override
-    public Double queryPriceByHouseId(int houseId) {
+    public Double queryPriceByHouseId(String houseId) {
         String sql = "select price from house where status = 1 and id = :houseId";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("houseId",houseId);

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

@@ -196,7 +196,7 @@ public class HousePriceDaoImpl implements HousePriceDao {
      * @return
      */
     @Override
-    public List<HousePriceDataVo> queryPriceByHouseId(Integer houseId, String startTime, String endTime) {
+    public List<HousePriceDataVo> queryPriceByHouseId(String houseId, String startTime, String endTime) {
         String sql = "select * from (SELECT house_id,price,SUBSTRING_INDEX(set_date,',',1) as start_time,SUBSTRING_INDEX(set_date,',',-1) as end_time,create_date from house_price\n" +
                 "where status = 1 and house_id =:houseId) t\n" +
                 "where (t.start_time <=:startTime and t.end_time >=:endTime) \n" +

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

@@ -77,6 +77,6 @@ public interface HousePriceService {
      * @param endTime
      * @return
      */
-    List<HousePriceDataVo> queryPriceByHouseId(Integer houseId, String startTime, String endTime);
+    List<HousePriceDataVo> queryPriceByHouseId(String houseId, String startTime, String endTime);
 
 }

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

@@ -103,5 +103,5 @@ public interface HouseService {
      * 根据房型查询默认价格
      * @return
      */
-    Double queryPriceByHouseId(int managerId);
+    Double queryPriceByHouseId(String managerId);
 }

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

@@ -105,7 +105,7 @@ public class AppBookImplService implements AppBookService {
         /**
          * 2023-09-15 A-jax 订单总价等于房间数量 * 这些天的价格总和
          */
-        List<HousePriceDataVo> priceDatas = housePriceService.queryPriceByHouseId(Integer.valueOf(house.getId()), startTime, TimeExchange.TimeDesD(endTime, -1));
+        List<HousePriceDataVo> priceDatas = housePriceService.queryPriceByHouseId(house.getId(), startTime, TimeExchange.TimeDesD(endTime, -1));
 
         List<HousePriceOneDataVo> oneDatas = new ArrayList<>();
         //将数据处理成单天的
@@ -140,7 +140,7 @@ public class AppBookImplService implements AppBookService {
         /**
          * 获取该房型默认价格
          */
-        Double housePrice = houseService.queryPriceByHouseId(Integer.valueOf(house.getId()));
+        Double housePrice = houseService.queryPriceByHouseId(house.getId());
         Double dayPrices = 0.0;
         for (String dateStr : dateStrs) {
             HousePriceResultVo data = new HousePriceResultVo();

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

@@ -55,9 +55,12 @@ public class HouseImplService implements HouseService {
     public IPage<House> queryPage(String sqlx, int page, int rows) {
         IPage<House> iPage = new IPage();
         List<House> houseList = houseDao.queryPage(sqlx,page,rows);
-        houseList.forEach(house -> {
-            house.setHouseNumbers(houseNumberDao.queryByHouseId(String.valueOf(house.getId())));
-        });
+        if(houseList != null){
+            houseList.forEach(house -> {
+                house.setHouseNumbers(houseNumberDao.queryByHouseId(String.valueOf(house.getId())));
+            });
+        }
+
         int total = houseDao.queryTotal(sqlx);
         iPage.setPageList(houseList);
         iPage.setPage(page);
@@ -111,7 +114,7 @@ public class HouseImplService implements HouseService {
 
 
     @Override
-    public Double queryPriceByHouseId(int houseId) {
+    public Double queryPriceByHouseId(String houseId) {
         return houseDao.queryPriceByHouseId(houseId);
     }
 }

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

@@ -233,7 +233,7 @@ public class HousePriceServiceImpl implements HousePriceService {
 
 
     @Override
-    public List<HousePriceDataVo> queryPriceByHouseId(Integer houseId, String startTime, String endTime){
+    public List<HousePriceDataVo> queryPriceByHouseId(String houseId, String startTime, String endTime){
         List<HousePriceDataVo> result = housePriceDao.queryPriceByHouseId(houseId, startTime, endTime);
         return result;
     }