From dd9759eaa3dabd3d55943fc0c741fd5018d2d76e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 31 五月 2023 16:43:29 +0800
Subject: [PATCH] optimize dining
---
service-store/src/main/java/com/java110/store/cmd/reserveOrder/SaveReserveGoodsOrderCmd.java | 97 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 76 insertions(+), 21 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/reserveOrder/SaveReserveGoodsOrderCmd.java b/service-store/src/main/java/com/java110/store/cmd/reserveOrder/SaveReserveGoodsOrderCmd.java
index b3ed769..d408261 100644
--- a/service-store/src/main/java/com/java110/store/cmd/reserveOrder/SaveReserveGoodsOrderCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/reserveOrder/SaveReserveGoodsOrderCmd.java
@@ -23,22 +23,28 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.communitySpacePerson.CommunitySpacePersonDto;
-import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto;
-import com.java110.dto.reserveGoodsOrderTime.ReserveGoodsOrderTimeDto;
+import com.java110.dto.reserve.ReserveGoodsDto;
+import com.java110.dto.reserve.ReserveGoodsOrderDto;
+import com.java110.dto.reserve.ReserveGoodsOrderTimeDto;
+import com.java110.dto.reserve.ReserveParamsDto;
import com.java110.intf.store.IReserveGoodsOrderTimeV1InnerServiceSMO;
import com.java110.intf.store.IReserveGoodsOrderV1InnerServiceSMO;
-import com.java110.po.communitySpacePersonTime.CommunitySpacePersonTimePo;
+import com.java110.intf.store.IReserveGoodsV1InnerServiceSMO;
import com.java110.po.reserveGoodsOrder.ReserveGoodsOrderPo;
import com.java110.po.reserveGoodsOrderTime.ReserveGoodsOrderTimePo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.List;
/**
* 绫昏〃杩帮細淇濆瓨
@@ -63,6 +69,9 @@
@Autowired
private IReserveGoodsOrderTimeV1InnerServiceSMO reserveGoodsOrderTimeV1InnerServiceSMOImpl;
+ @Autowired
+ private IReserveGoodsV1InnerServiceSMO reserveGoodsV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "goodsId", "璇锋眰鎶ユ枃涓湭鍖呭惈goodsId");
@@ -73,30 +82,75 @@
Assert.hasKeyAndValue(reqJson, "receivedAmount", "璇锋眰鎶ユ枃涓湭鍖呭惈receivedAmount");
Assert.hasKeyAndValue(reqJson, "payWay", "璇锋眰鎶ユ枃涓湭鍖呭惈payWay");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
- Assert.hasKeyAndValue(reqJson, "extOrderId", "璇锋眰鎶ユ枃涓湭鍖呭惈extOrderId");
- if(!reqJson.containsKey("openTimes")){
- cmdDataFlowContext.setResponseEntity(ResultVo.success());
- return ;
+ //鏍￠獙鏄惁鍙互棰勭害
+ ReserveGoodsDto reserveGoodsDto = new ReserveGoodsDto();
+ reserveGoodsDto.setGoodsId(reqJson.getString("goodsId"));
+ List<ReserveGoodsDto> reserveGoodsDtos = reserveGoodsV1InnerServiceSMOImpl.queryReserveGoodss(reserveGoodsDto);
+ if ("1001".equals(reqJson.getString("type"))) {
+ Assert.listOnlyOne(reserveGoodsDtos, "灏遍涓嶅瓨鍦�");
+ } else {
+ Assert.listOnlyOne(reserveGoodsDtos, "鏈嶅姟涓嶅瓨鍦�");
}
- JSONArray openTimes = reqJson.getJSONArray("openTimes");
+ checkAppointmentTime(reqJson, reserveGoodsDtos.get(0));
- if(openTimes == null || openTimes.size() <1){
+ if (!reqJson.containsKey("times")) {
cmdDataFlowContext.setResponseEntity(ResultVo.success());
- return ;
+ return;
+ }
+
+ JSONArray openTimes = reqJson.getJSONArray("times");
+
+ if (openTimes == null || openTimes.size() < 1) {
+ cmdDataFlowContext.setResponseEntity(ResultVo.success());
+ return;
}
ReserveGoodsOrderTimeDto reserveGoodsOrderTimeDto = null;
int flag = 0;
- for(int timeIndex = 0 ;timeIndex < openTimes.size(); timeIndex++) {
+ int quantity = 0;
+ for (int timeIndex = 0; timeIndex < openTimes.size(); timeIndex++) {
reserveGoodsOrderTimeDto = new ReserveGoodsOrderTimeDto();
reserveGoodsOrderTimeDto.setCommunityId(reqJson.getString("communityId"));
reserveGoodsOrderTimeDto.setAppointmentTime(reqJson.getString("appointmentTime"));
reserveGoodsOrderTimeDto.setHours(openTimes.getJSONObject(timeIndex).getString("hours"));
reserveGoodsOrderTimeDto.setGoodsId(reqJson.getString("goodsId"));
flag = reserveGoodsOrderTimeV1InnerServiceSMOImpl.queryReserveGoodsOrderTimesCount(reserveGoodsOrderTimeDto);
- if(flag > 0){
- throw new CmdException(reqJson.getString("appointmentTime")+","+openTimes.getJSONObject(timeIndex).getString("hours")+"宸茬粡琚绾�");
+ if (flag > 0) {
+ throw new CmdException(reqJson.getString("appointmentTime") + "," + openTimes.getJSONObject(timeIndex).getString("hours") + "宸茬粡琚绾�");
+ }
+
+ quantity = Integer.parseInt(openTimes.getJSONObject(timeIndex).getString("quantity"));
+ if (quantity > Integer.parseInt(reserveGoodsDtos.get(0).getHoursMaxQuantity())) {
+ throw new CmdException("棰勭害鏁伴噺瓒呰繃璁惧畾鏁伴噺");
+ }
+ }
+ }
+
+ private void checkAppointmentTime(JSONObject reqJson, ReserveGoodsDto reserveGoodsDto) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(DateUtil.getDateFromStringB(reqJson.getString("appointmentTime")));
+ int day;
+ String[] days = reserveGoodsDto.getParamWayText().split(",");
+
+ if (ReserveParamsDto.PARAM_WAY_DAY.equals(reserveGoodsDto.getParamWay())) {
+ day = calendar.get(Calendar.DAY_OF_MONTH);
+ if (!Arrays.asList(days).contains(day + "")) {
+ throw new CmdException(reqJson.getString("appointmentTime") + "涓嶈兘棰勭害");
+ }
+ } else {
+ day = calendar.get(Calendar.DAY_OF_WEEK);
+ boolean isFirstSunday = (calendar.getFirstDayOfWeek() == Calendar.SUNDAY);
+ //鑾峰彇鍛ㄥ嚑
+ //鑻ヤ竴鍛ㄧ涓�澶╀负鏄熸湡澶╋紝鍒�-1
+ if (isFirstSunday) {
+ day = day - 1;
+ if (day == 0) {
+ day = 7;
+ }
+ }
+ if (!Arrays.asList(days).contains(day + "")) {
+ throw new CmdException(reqJson.getString("appointmentTime") + "涓嶈兘棰勭害");
}
}
}
@@ -106,29 +160,30 @@
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
ReserveGoodsOrderPo reserveGoodsOrderPo = BeanConvertUtil.covertBean(reqJson, ReserveGoodsOrderPo.class);
reserveGoodsOrderPo.setOrderId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
- if(StringUtil.isEmpty(reserveGoodsOrderPo.getExtOrderId())){
+ if (StringUtil.isEmpty(reserveGoodsOrderPo.getExtOrderId())) {
reserveGoodsOrderPo.setExtOrderId("-1");
}
- if(StringUtil.isEmpty(reserveGoodsOrderPo.getState())){
- reserveGoodsOrderPo.setState(CommunitySpacePersonDto.STATE_W);
- }
+
+ reserveGoodsOrderPo.setState(ReserveGoodsOrderDto.STATE_W);
+
int flag = reserveGoodsOrderV1InnerServiceSMOImpl.saveReserveGoodsOrder(reserveGoodsOrderPo);
if (flag < 1) {
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
- JSONArray openTimes = reqJson.getJSONArray("openTimes");
+ JSONArray openTimes = reqJson.getJSONArray("times");
ReserveGoodsOrderTimePo reserveGoodsOrderTimePo = null;
- for(int timeIndex = 0 ;timeIndex < openTimes.size(); timeIndex++) {
+ for (int timeIndex = 0; timeIndex < openTimes.size(); timeIndex++) {
reserveGoodsOrderTimePo = new ReserveGoodsOrderTimePo();
reserveGoodsOrderTimePo.setCommunityId(reserveGoodsOrderPo.getCommunityId());
reserveGoodsOrderTimePo.setGoodsId(reserveGoodsOrderPo.getGoodsId());
+ reserveGoodsOrderTimePo.setOrderId(reserveGoodsOrderPo.getOrderId());
reserveGoodsOrderTimePo.setHours(openTimes.getJSONObject(timeIndex).getString("hours"));
reserveGoodsOrderTimePo.setQuantity(openTimes.getJSONObject(timeIndex).getString("quantity"));
reserveGoodsOrderTimePo.setTimeId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
- reserveGoodsOrderTimePo.setState(CommunitySpacePersonTimeDto.STATE_WAIT_CONFIRM);
+ reserveGoodsOrderTimePo.setState(ReserveGoodsOrderTimeDto.STATE_WAIT_CONFIRM);
reserveGoodsOrderTimeV1InnerServiceSMOImpl.saveReserveGoodsOrderTime(reserveGoodsOrderTimePo);
}
--
Gitblit v1.8.0