修改使用优惠券

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

@@ -242,17 +242,13 @@ public class AppHomePageAction extends ActionSupport implements ServletRequestAw
             dateStrs.add(date);
         }
         List<House> houseList = hotel.getHouseList();
-        for (House houseData:houseList) {
-            Double todayPrice = 0.0;
+        for (House houseData : houseList) {
             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();
-                }else{
-                    todayPrice = todayPrice + houseData.getPrice();
+                    houseData.setPrice(houseData.getPrice() + oneData.get().getPrice());
                 }
             }
-            houseData.setPrice(todayPrice);
             if(dateStrs.size() > 0){
                 houseData.setPrice(houseData.getPrice() == 0.0 ? 0.0 : (houseData.getPrice() / dateStrs.size()));
             }

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

@@ -420,9 +420,11 @@ public class AppHotelCouponAction extends ActionSupport implements ServletReques
                 useCouponsVo.setDiscountAmount(subtract1.doubleValue());
             } else if (v < v1) {
                 useCouponsVo.setDiscountAmount(maxDeduction);
+            }else if (v==v1){
+                useCouponsVo.setDiscountAmount(maxDeduction);
             }
 
-            useCouponsVo.setTypeName("优惠卷");
+            useCouponsVo.setTypeName("折扣卷");
             useCouponsVo.setHotelCouponName(hotelCoupon.getName());