Merge branch 'master' of https://e.coding.net/chuanghaikeji/jinganxiangsu/Homestay_app_houtai

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

@@ -228,6 +228,14 @@ public class AppMePageAction extends ActionSupport implements ServletRequestAwar
         List<FileInfo> fileInfoList = fileService.queryListByLinkId(book.getHouseId());
         book.setHouseFileInfoList(fileInfoList);
 
+        /**
+         * 未付款订单的实际支付金额为房间总价
+         */
+        String orderStatus = book.getOrderStatus();
+        if (!"2".equals(orderStatus) && !"3".equals(orderStatus) && !"4".equals(orderStatus) && !"5".equals(orderStatus)) {
+            book.setPayAccount(book.getHouseTotalPrice());
+        }
+
         resultJson.put(B.code, ResultStatusCode.OK.getStatus());
         resultJson.put(B.message, ResultStatusCode.OK.getMsg());
         resultJson.put(B.data, book);