Browse Source

订单功能

Administrator 2 years ago
parent
commit
b297de76f7

+ 9 - 1
mhotel/src/com/happy/Model/Booking.java

@@ -47,7 +47,7 @@ public class Booking {
   private String refundTime; // 退款时间
   private String checkOutTime; // 离店时间
   private String remake; // 备注信息
-
+  private int isDelete; // 是否假删除:1是,2否
 
   public Integer getId() {
     return id;
@@ -413,4 +413,12 @@ public class Booking {
   public void setHotelManagerId(String hotelManagerId) {
     this.hotelManagerId = hotelManagerId;
   }
+
+  public int getIsDelete() {
+    return isDelete;
+  }
+
+  public void setIsDelete(int isDelete) {
+    this.isDelete = isDelete;
+  }
 }

+ 63 - 0
mhotel/src/com/happy/action/AppBookingAction.java

@@ -1,9 +1,13 @@
 package com.happy.action;
 
+import com.happy.Model.Booking;
+import com.happy.Model.weixin.Users;
 import com.happy.Until.Enum.B;
 import com.happy.Until.Func;
+import com.happy.Until.ResUtil;
 import com.happy.Until.ResponseUtil;
 import com.happy.Until.ResultUtil;
+import com.happy.common.http.Message;
 import com.happy.constant.ResultStatusCode;
 import com.happy.service.AppBookService;
 import com.happy.service.BookService;
@@ -43,6 +47,16 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
     public String userPhone; // 住客联系电话
     public String userId; // 下单人id
 
+    public String getBookingId() {
+        return bookingId;
+    }
+
+    public void setBookingId(String bookingId) {
+        this.bookingId = bookingId;
+    }
+
+    public String bookingId; // 订单Id
+
     public HttpServletRequest getRequest() {
         return request;
     }
@@ -150,6 +164,55 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         return null;
     }
 
+    /**
+     * 取消订单功能
+     * @return
+     */
+    public String cancelBooking(){
+        if (Func.checkNull(bookingId))
+            return null;
+
+        JSONObject jsonObject = new JSONObject();
+
+        String mess = bookService.cancelBooking(bookingId);
+        if (!Func.checkNull(mess))
+        {
+            jsonObject.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
+            jsonObject.put(B.MESSAGE,mess);
+            ResponseUtil.writeJson(ServletActionContext.getResponse(),jsonObject.toString());
+            return null;
+        }
+
+        jsonObject.put(B.CODE, ResultStatusCode.OK.getStatus());
+        jsonObject.put(B.MESSAGE,ResultStatusCode.OK.getMsg());
+        ResponseUtil.writeJson(ServletActionContext.getResponse(),jsonObject.toString());
+        return null;
+    }
+
+    /**
+     * 删除订单功能(假删除)
+     * @return
+     */
+    public String delBooking(){
+        if (Func.checkNull(bookingId))
+            return null;
+
+        JSONObject jsonObject = new JSONObject();
+
+        String mess = bookService.delBooking(bookingId);
+        if (!Func.checkNull(mess))
+        {
+            jsonObject.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
+            jsonObject.put(B.MESSAGE,mess);
+            ResponseUtil.writeJson(ServletActionContext.getResponse(),jsonObject.toString());
+            return null;
+        }
+
+        jsonObject.put(B.CODE, ResultStatusCode.OK.getStatus());
+        jsonObject.put(B.MESSAGE,ResultStatusCode.OK.getMsg());
+        ResponseUtil.writeJson(ServletActionContext.getResponse(),jsonObject.toString());
+        return null;
+    }
 
 
 

File diff suppressed because it is too large
+ 6 - 5
mhotel/src/com/happy/dao/impl/BookImplDao.java


+ 13 - 0
mhotel/src/com/happy/service/BookService.java

@@ -74,4 +74,17 @@ public interface BookService {
      */
     BookTypeEto getBookStatusSum(String sqlx);
 
+    /**
+     * 取消订单功能
+     * @param bookingId
+     * @return
+     */
+    String cancelBooking(String bookingId);
+
+    /**
+     * 删除订单(假删除)
+     * @param bookingId
+     * @return
+     */
+    String delBooking(String bookingId);
 }

+ 46 - 0
mhotel/src/com/happy/service/impl/BookImplService.java

@@ -1,6 +1,9 @@
 package com.happy.service.impl;
 
 import com.happy.Model.Booking;
+import com.happy.Until.DateUtil;
+import com.happy.Until.Enum.PayEnum;
+import com.happy.Until.Func;
 import com.happy.dao.BookDao;
 import com.happy.dto.BookTypeEto;
 import com.happy.dto.IPage;
@@ -8,6 +11,7 @@ import com.happy.service.BookService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 @Service("BookService")
@@ -70,4 +74,46 @@ public class BookImplService implements BookService {
     public BookTypeEto getBookStatusSum(String sqlx){
         return bookDao.getBookStatusSum(sqlx);
     }
+
+    @Override
+    public String cancelBooking(String bookingId) {
+        if (Func.checkNull(bookingId))
+            return "未传入订单id";
+
+        Booking book = bookDao.getById(Func.parseInt(bookingId));
+        //是否能取消订单(1是 2否)
+        if (Func.parseInt(book.getHotelIsCanorder()) == 2)
+            return "商家设置不可取消订单,请联系商家";
+
+        //1待支付,2已支付,3待入住,4已入住,5已消费,6支付超时,7已取消,8已退单,9已退款
+        int status = Func.parseInt(book.getOrderStatus());
+        if (status == 1)
+        {
+            book.setOrderStatus(Func.parseStr(PayEnum.SEVEN.getNum()));
+            book.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
+            bookDao.updateBooking(book);
+            return null;
+        }else if (status == 2 || status == 3)
+        {
+            book.setOrderStatus(Func.parseStr(PayEnum.SEVEN.getNum()));
+            book.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
+            bookDao.updateBooking(book);
+            // TODO 退款操作
+            return null;
+        }
+        return "不可取消订单";
+    }
+
+    @Override
+    public String delBooking(String bookingId) {
+        if (Func.checkNull(bookingId))
+            return "未传入订单id";
+
+        // 是否假删除:1删除,2正常
+        Booking book = bookDao.getById(Func.parseInt(bookingId));
+        book.setIsDelete(1);
+        book.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
+        bookDao.updateBooking(book);
+        return null;
+    }
 }