Merge remote-tracking branch 'origin/master'

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

@@ -78,7 +78,7 @@ public class AppBookImplService implements AppBookService {
         booking.setHouseOrderNumber(Func.parseInt(houseOrderNumber));
         booking.setHouseAreas(house.gethAreas());
         booking.setHouseRemake(house.getRemark());
-        double totalPrice = Func.parseInt(houseOrderNumber) * house.getPrice();
+        double totalPrice = Func.parseDbl(houseOrderNumber) * house.getPrice();
         booking.setHouseTotalPrice(totalPrice);
 
 
@@ -88,7 +88,7 @@ public class AppBookImplService implements AppBookService {
         booking.setOrderStartTime(startTime);
         booking.setOrderEndTime(endTime);
         int day = DateUtil.getDayDiff(startTime,endTime);
-        String orderLiveTime= day+ OrderEnum.间.toString()+ day +OrderEnum.晚.toString();
+        String orderLiveTime= Func.parseInt(houseOrderNumber)+ OrderEnum.间.toString()+ day +OrderEnum.晚.toString();
         booking.setOrderLiveTime(orderLiveTime);
 
         // 订单信息