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

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

@@ -26,6 +26,9 @@ import java.util.stream.Collectors;
 
 public class HousePriceAction extends BaseController implements ModelDriven<HousePriceDto> {
 
+    private HttpServletRequest request;
+    public HttpServletResponse response;
+
     /**
      * 房型ID
      */

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

@@ -128,7 +128,7 @@ public class BookingComplaintImplService implements BookingComplaintService {
         List<ComplaintPageVo> vos = bookingComplainDao.complaintPage(usersId, page, rows);
         if (vos != null && vos.size() > 0) {
             for (ComplaintPageVo vo : vos) {
-                String valueBykey = PayEnum.getValueBykey(Integer.valueOf(vo.getOrderStatus()));
+                String valueBykey = vo.getOrderStatus() == null ? "" : PayEnum.getValueBykey(Integer.valueOf(vo.getOrderStatus()));
                 vo.setOrderStatus(valueBykey);
                 String valueBykey1 = ProgressEnum.getValueBykey(Integer.valueOf(vo.getProgressType()));
                 vo.setProgressType(valueBykey1);