ソースを参照

新增订单基本接口

raojiaolong@163.com 2 年 前
コミット
567f4294f7

+ 3 - 3
mhotel/src/com/happy/Model/Booking.java

@@ -7,7 +7,7 @@ import java.util.Date;
  */
 public class Booking {
 
-  private int id;
+  private Integer id;
   private String orderNum; // 订单号
   private String orderStatus; // 状态,1待支付,2已支付,3待入住,4已入住,5已消费,6支付超时,7已取消,8已退单,9已退款
   private String userIdnumber; // 住客身份号
@@ -48,11 +48,11 @@ public class Booking {
   private String remake; // 备注信息
 
 
-  public int getId() {
+  public Integer getId() {
     return id;
   }
 
-  public void setId(int id) {
+  public void setId(Integer id) {
     this.id = id;
   }
 

+ 8 - 0
mhotel/src/com/happy/action/bookAction.java

@@ -451,4 +451,12 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
         ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
         return null;
     }
+
+    /**
+     * 描述:分页查询台账
+     * @return
+     */
+    public String quearyLedgerPage(){
+        return null;
+    }
 }

+ 53 - 35
mhotel/src/com/happy/dao/BookDao.java

@@ -1,44 +1,62 @@
 package com.happy.dao;
 
 import com.happy.Model.Booking;
+import com.happy.Model.Booking;
 
 import java.util.List;
 
 public interface BookDao {
+    
+    /**
+     * 描述:新增
+     * @param book
+     * @return
+     */
+    int insertBooking(Booking book);
+
+    /**
+     * 描述:修改
+     * @param book
+     * @return
+     */
+    int updateBooking(Booking book);
+
+    /**
+     * 描述:删除
+     * @param id
+     * @return
+     */
+    int delBooking(int id);
+
+    /**
+     * 描述:根据Id查询详细
+     * @param id
+     * @return
+     */
+    Booking getById(int id);
+
+    /**
+     * 描述:分页查询
+     * @param sqlx
+     * @param page
+     * @param rows
+     * @return
+     */
+    List<Booking> queryPage(String sqlx, int page, int rows);
+
+
+    /**
+     * 描述:获取总条数
+     * @param sqlx
+     * @return
+     */
+    int queryTotal(String sqlx);
+
+    /**
+     * 描述:查询列表
+     * @param sqlx
+     * @return
+     */
+    List<Booking> queryList(String sqlx);
 
-    public int insert(Booking booking);
-
-    // 修改预定状态
-    public int update(String status,String dom,int id);
-
-    // 修改支付状态
-    public int update_pay(String status,String order_num);
-
-    // 删除订单
-    public int del(int id);
-
-    public Booking queryBookById(int id);
-
-    public List<Booking> queryBookPage(String sqlx, int page, int rows);
-
-    // 查询用户表中的总记录数
-    public int queryBookTotal(String sqlx);
-
-    // 导出订单数据
-    public List<Booking> queryBooks(String sqlx);
-
-    // 查看每天未完成的订单
-    public List<Booking> queryOrdering(String h_type,String use_time);
-
-    public List<Booking> queryOrderByType(String h_type);
-
-    // 查看是否有空房
-    public List<Booking> querySpare(String h_type,String use_time);
-
-    public Booking queryByOrder(String order_num);
-
-    // 查询已入住且截至的订单
-    public List<Booking> queryEnd(String date);
-
-    public List<Booking> queryByCard(String card_number,String status);
 }

ファイルの差分が大きいため隠しています
+ 121 - 142
mhotel/src/com/happy/dao/impl/BookImplDao.java


+ 52 - 35
mhotel/src/com/happy/service/BookService.java

@@ -1,45 +1,62 @@
 package com.happy.service;
 
 import com.happy.Model.Booking;
+import com.happy.Model.Booking;
+import com.happy.dto.IPage;
 
 import java.util.List;
 
 public interface BookService {
 
-    public int insert(Booking booking);
-
-    // 修改预定状态
-    public int update(String status,String dom,int id);
-
-    // 修改支付状态
-    public int update_pay(String status,String order_num);
-
-    // 删除订单
-    public int del(int id);
-
-    public Booking queryBookById(int id);
-
-    public List<Booking> queryBookPage(String sqlx, int page, int rows);
-
-    // 查询用户表中的总记录数
-    public int queryBookTotal(String sqlx);
-
-    // 导出订单数据
-    public List<Booking> queryBooks(String sqlx);
-
-    // 查看每天未完成的订单与修改后的数量比较
-    public boolean queryOrdering(String h_type,int num);
-
-    public List<Booking> queryOrderByType(String h_type);
-
-    // 查看是否有空房
-    public boolean querySpare(String h_type,List<String> times);
-
-    public Booking queryByOrder(String order_num);
-
-    // 查询已入住且截至的订单
-    public List<Booking> queryEnd(String date);
-
-    public List<Booking> queryByCard(String card_number,String status);
+    /**
+     * 描述:新增
+     * @param book
+     * @return
+     */
+    int insertBooking(Booking book);
+
+    /**
+     * 描述:修改
+     * @param book
+     * @return
+     */
+    int updateBooking(Booking book);
+
+    /**
+     * 描述:删除
+     * @param id
+     * @return
+     */
+    int delBooking(int id);
+
+    /**
+     * 描述:根据Id查询详细
+     * @param id
+     * @return
+     */
+    Booking getById(int id);
+
+    /**
+     * 描述:分页查询
+     * @param sqlx
+     * @param page
+     * @param rows
+     * @return
+     */
+    IPage<Booking> queryPage(String sqlx, int page, int rows);
+
+    /**
+     * 描述:查询列表
+     * @param sqlx
+     * @return
+     */
+    List<Booking> queryList(String sqlx);
+
+    /**
+     * 描述:查询一条数据
+     * @param sqlx
+     * @return
+     */
+    Booking getOen(String sqlx);
 
 }

+ 32 - 71
mhotel/src/com/happy/service/impl/BookImplService.java

@@ -1,10 +1,8 @@
 package com.happy.service.impl;
 
 import com.happy.Model.Booking;
-import com.happy.Model.House;
-import com.happy.Until.TimeExchange;
 import com.happy.dao.BookDao;
-import com.happy.dao.HouseDao;
+import com.happy.dto.IPage;
 import com.happy.service.BookService;
 import org.springframework.stereotype.Service;
 
@@ -16,86 +14,49 @@ public class BookImplService implements BookService {
 
     @Resource
     public BookDao bookDao;
-    @Resource
-    public HouseDao houseDao;
-
-    public int insert(Booking booking){
-        return bookDao.insert(booking);
-    }
-
-    // 修改预定状态
-    public int update(String status,String dom,int id){
-        return bookDao.update(status,dom, id);
-    }
-
-    // 修改支付状态
-    public int update_pay(String status,String order_num){
-        return bookDao.update_pay(status, order_num);
-    }
-
-    // 删除订单
-    public int del(int id){
-        return bookDao.del(id);
-    }
-
-    public Booking queryBookById(int id){
-        return bookDao.queryBookById(id);
-    }
-
-    public List<Booking> queryBookPage(String sqlx, int page, int rows){
-        return bookDao.queryBookPage(sqlx, page, rows);
-    }
-
-    // 查询用户表中的总记录数
-    public int queryBookTotal(String sqlx){
-        return bookDao.queryBookTotal(sqlx);
-    }
 
-    // 导出订单数据
-    public List<Booking> queryBooks(String sqlx){
-        return bookDao.queryBooks(sqlx);
+    @Override
+    public int insertBooking(Booking book) {
+        return bookDao.insertBooking(book);
     }
 
-    // 查看每天未完成的订单与修改后的数量比较
-    public boolean queryOrdering(String h_type,int num){
-        List<String> use_times = TimeExchange.getHighTime();
-        for (int i = 0; i < use_times.size(); i++) {
-            // 当天已租出去的房间数量
-            List<Booking> list = bookDao.queryOrdering(h_type,use_times.get(i));
-            System.out.println(list);
-            if (list!=null && list.size()>num){
-                return false;
-            }
-        }
-        return true;
+    @Override
+    public int updateBooking(Booking book) {
+        return bookDao.updateBooking(book);
     }
 
-    public List<Booking> queryOrderByType(String h_type){
-        return bookDao.queryOrderByType(h_type);
+    @Override
+    public int delBooking(int id) {
+        return bookDao.delBooking(id);
     }
 
-    // 查看是否有空房
-    public boolean querySpare(String h_type,List<String> times){
-//        House house = houseDao.queryByType(h_type);
-//        for (int i = 0; i < times.size(); i++) {
-//            List<Booking> list = bookDao.querySpare(h_type,times.get(i));
-//            if (list!=null && list.size()>=house.getNumber()){
-//                return false;
-//            }
-//        }
-        return true;
+    @Override
+    public Booking getById(int id) {
+        return bookDao.getById(id);
     }
 
-    public Booking queryByOrder(String order_num){
-        return bookDao.queryByOrder(order_num);
+    @Override
+    public IPage<Booking> queryPage(String sqlx, int page, int rows) {
+        IPage<Booking> iPage = new IPage();
+        List<Booking> bookList = bookDao.queryPage(sqlx,page,rows);
+        int total = bookDao.queryTotal(sqlx);
+        iPage.setPageList(bookList);
+        iPage.setPage(page);
+        iPage.setTotalPage( (int)Math.ceil((double)total/rows));
+        iPage.setRows(rows);
+        iPage.setTotal(total);
+        return iPage;
     }
 
-    // 查询已入住且截至的订单
-    public List<Booking> queryEnd(String date){
-        return bookDao.queryEnd(date);
+    @Override
+    public List<Booking> queryList(String sqlx) {
+        return bookDao.queryList(sqlx);
     }
 
-    public List<Booking> queryByCard(String card_number,String status){
-        return bookDao.queryByCard(card_number, status);
+    @Override
+    public Booking getOen(String sqlx){
+        List<Booking> list = bookDao.queryList(sqlx);
+        if(list!=null && list.size()>0) return list.get(0);
+        return null;
     }
 }