平均价

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

@@ -22,6 +22,7 @@ import org.apache.struts2.interceptor.ServletRequestAware;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -243,16 +244,16 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
         }
         List<House> houseList = hotel.getHouseList();
         for (House houseData:houseList) {
-            Double todayPrice = 0.0;
+            BigDecimal todayPrice = BigDecimal.ZERO;
             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()){
-                    todayPrice = todayPrice + oneData.get().getPrice();
+                    todayPrice = todayPrice.add(BigDecimal.valueOf(oneData.get().getPrice()));
                 }else{
-                    todayPrice = todayPrice + houseData.getPrice();
+                    todayPrice = todayPrice.add(BigDecimal.valueOf(houseData.getPrice()));
                 }
             }
-            houseData.setPrice(todayPrice);
+            houseData.setPrice(todayPrice.doubleValue());
             if(dateStrs.size() > 0){
                 houseData.setPrice(houseData.getPrice() == 0.0 ? 0.0 : (houseData.getPrice() / dateStrs.size()));
             }