소스 검색

日历价格

夏文涛 2 년 전
부모
커밋
ec0e07a3b1
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      mhotel/src/com/happy/action/HousePriceAction.java
  2. 1 1
      mhotel/src/com/happy/action/adminAction.java

+ 1 - 1
mhotel/src/com/happy/action/HousePriceAction.java

@@ -274,7 +274,7 @@ public class HousePriceAction extends BaseController implements ModelDriven<Hous
             data.setDate(str);
             List<HousePriceOneDataVo> priceDatas = newOneDatas.stream().filter(e -> e.getSetDate().equals(str)).sorted(Comparator.comparing(HousePriceOneDataVo::getPrice)).collect(Collectors.toList());
 
-            if (priceDatas.size() > 0) {
+            if (priceDatas.size() > 0 && priceDatas.get(0).getPrice() < minPrice) {
                 data.setTopinfo("¥" + decimalFormat.format(priceDatas.get(0).getPrice()) + "起");
             } else {
                 data.setTopinfo("¥" + decimalFormat.format(minPrice) + "起");

+ 1 - 1
mhotel/src/com/happy/action/adminAction.java

@@ -58,7 +58,7 @@ public class adminAction extends ActionSupport implements ServletRequestAware {
         JSONObject resultJson = new JSONObject();
         resultJson.put("message", "操作成功");
         resultJson.put("code", 200);
-        resultJson.put("data", "1");
+        resultJson.put("data", "0");
         ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
         return null;
     }