Ver código fonte

生成订单

Administrator 2 anos atrás
pai
commit
cf261925f3

+ 30 - 5
mhotel/src/com/happy/action/AppBookingAction.java

@@ -2,12 +2,9 @@ package com.happy.action;
 
 import com.happy.Model.Booking;
 import com.happy.Model.weixin.Users;
+import com.happy.Until.*;
 import com.happy.Until.Enum.B;
 import com.happy.Until.Enum.OrderEnum;
-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;
@@ -135,7 +132,21 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             return null;
         }
 
-        String mess = appBookService.createOrder(houseId, startTime, endTime, houseOrderNumber,userName,userPhone, userId);
+        // 将时间统一转化为 yyyy/MM/dd
+        String startDate = DateUtil.parseDateToStr((Func.parseDate(startTime)),DateUtil.Time_Formatter_Day);
+        String endDate = DateUtil.parseDateToStr((Func.parseDate(endTime)),DateUtil.Time_Formatter_Day);
+
+        // 创建订单之前,先验证是否有房间
+        String backMessage = appBookService.varificationHouse(houseId, startDate, endDate);
+        if(Func.checkNull(backMessage))
+        {
+            jsonObject.put(B.CODE, ResultStatusCode.CANNTBOOKING.getStatus());
+            jsonObject.put(B.MESSAGE,backMessage);
+            ResponseUtil.writeJson(ServletActionContext.getResponse(),jsonObject.toString());
+            return null;
+        }
+
+        String mess = appBookService.createOrder(houseId, startDate, endDate, houseOrderNumber,userName,userPhone, userId);
         if (!Func.checkNull(mess))
         {
             jsonObject.put(B.CODE, ResultStatusCode.BAD_REQUEST.getStatus());
@@ -166,6 +177,20 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             return null;
         }
 
+        // 将时间统一转化为 yyyy/MM/dd
+        String startDate = DateUtil.parseDateToStr((Func.parseDate(startTime)),DateUtil.Time_Formatter_Day);
+        String endDate = DateUtil.parseDateToStr((Func.parseDate(endTime)),DateUtil.Time_Formatter_Day);
+
+        // 创建订单之前,先验证是否有房间
+        String backMessage = appBookService.varificationHouse(houseId, startDate, endDate);
+        if(Func.checkNull(backMessage))
+        {
+            jsonObject.put(B.CODE, ResultStatusCode.CANNTBOOKING.getStatus());
+            jsonObject.put(B.MESSAGE,backMessage);
+            ResponseUtil.writeJson(ServletActionContext.getResponse(),jsonObject.toString());
+            return null;
+        }
+
         appBookService.reCreateOrder(houseId, startTime, endTime, houseOrderNumber,userName,userPhone, userId);
         jsonObject.put(B.CODE, ResultStatusCode.OK.getStatus());
         ResponseUtil.writeJson(ServletActionContext.getResponse(),jsonObject.toString());

+ 2 - 0
mhotel/src/com/happy/constant/ResultStatusCode.java

@@ -9,6 +9,8 @@ public enum ResultStatusCode {
 	TIME_OUT(130, "访问超时"),
 	/** 参数解析失败 */
 	BAD_REQUEST(400, "参数解析失败"),
+	/** 无法订房 */
+	CANNTBOOKING(400, "无法订房"),
 	/** 记录不存在 */
 	NOT_EXIST(404, "记录不存在"),
 	/** 不支持当前请求方法 */

+ 4 - 2
mhotel/src/com/happy/service/impl/AppBookImplService.java

@@ -11,6 +11,7 @@ import com.happy.Until.Enum.OrderEnum;
 import com.happy.Until.Enum.PayEnum;
 import com.happy.Until.Func;
 import com.happy.Until.TimeExchange;
+import com.happy.constant.ResultStatusCode;
 import com.happy.dao.BookDao;
 import com.happy.dto.IPage;
 import com.happy.service.*;
@@ -89,8 +90,9 @@ public class AppBookImplService implements AppBookService {
         booking.setOrderNum(Func.parseStr(orderNum));
         booking.setOrderStatus(Func.parseStr(PayEnum.ONE.getNum())); // 1待支付状态
         booking.setCreateTime(DateUtil.getFormatPaternDate(DateUtil.getCurrentDate()));
-        bookService.insertBooking(booking);
-
+        int i = bookService.insertBooking(booking);
+        if ( i == 0)
+            return ResultStatusCode.CANNTBOOKING.CANNTBOOKING.getMsg();
 
         return null;
     }

+ 5 - 7
mhotel/src/struts.xml

@@ -18,9 +18,9 @@
 	<constant name="struts.multipart.maxSize" value="50000000"/>
 
 	<package name="happy" namespace="/" extends="struts-default">
-		<action name="data*" method = "{1}" class="com.happy.action.DataAction">
-			<result name="list">/jsp/list.jsp</result>
-		</action>
+<!--		<action name="data*" method = "{1}" class="com.happy.action.DataAction">-->
+<!--			<result name="list">/jsp/list.jsp</result>-->
+<!--		</action>-->
 		<action name="admin*" method = "{1}" class="com.happy.action.adminAction">
 		</action>
 		<action name="managerAdmin*" method = "{1}" class="com.happy.action.adminManagerAction">
@@ -33,8 +33,7 @@
 		</action>
 		<action name="book*" method = "{1}" class="com.happy.action.bookAction">
 		</action>
-		<action name="app*" method = "{1}" class="com.happy.action.appAction">
-		</action>
+<!--		<action name="app*" method = "{1}" class="com.happy.action.appAction"></action>-->
 		<action name="upload*" method = "{1}" class="com.happy.action.uploadAction">
 		</action>
 
@@ -45,8 +44,7 @@
 	</package>
 	<package name="interfaces" namespace="/interfaces" extends="struts-default">
 		<!-- 接口总调度开始 -->
-		<action name="main*" method="{1}" class="com.happy.action.MainAction">
-		</action>
+<!--		<action name="main*" method="{1}" class="com.happy.action.MainAction"></action>-->
 	</package>
 
 </struts>