Merge remote-tracking branch 'origin/master'

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

@@ -608,8 +608,8 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
 
         try {
             // 支付费用
-            int totalPrice = (int) booking.getHouseTotalPrice();
-            int totalfee = (int) (totalPrice * 100);
+            Double totalPrice = booking.getHouseTotalPrice() * 100;
+            int totalfee = Func.parseInt(totalPrice);
 
             WechatUnifiedOrder w = new WechatUnifiedOrder();
             w.setAppid(WeiXinUtil.appid_c);