提交价格修改

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

@@ -242,13 +242,17 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
             dateStrs.add(date);
         }
         List<House> houseList = hotel.getHouseList();
-        for (House houseData : houseList) {
+        for (House houseData:houseList) {
+            Double todayPrice = 0.0;
             for (String dateStr:dateStrs){
                 Optional<HousePriceOneDataVo> oneData = oneDatas.stream().filter(e -> e.getHouseId().equals(houseData.getId()) && e.getSetDate().equals(dateStr)).sorted(Comparator.comparing(HousePriceOneDataVo::getCreateDate,Comparator.reverseOrder())).findFirst();
                 if(oneData != null && oneData.isPresent()){
-                    houseData.setPrice(houseData.getPrice() + oneData.get().getPrice());
+                    todayPrice = todayPrice + oneData.get().getPrice();
+                }else{
+                    todayPrice = todayPrice + houseData.getPrice();
                 }
             }
+            houseData.setPrice(todayPrice);
             if(dateStrs.size() > 0){
                 houseData.setPrice(houseData.getPrice() == 0.0 ? 0.0 : (houseData.getPrice() / dateStrs.size()));
             }