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 | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 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 a09e7b9..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,15 +23,13 @@
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.reserveGoods.ReserveGoodsDto;
-import com.java110.dto.reserveGoodsOrderTime.ReserveGoodsOrderTimeDto;
-import com.java110.dto.reserveParams.ReserveParamsDto;
+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.intf.store.IReserveGoodsV1InnerServiceSMO;
-import com.java110.po.communitySpacePersonTime.CommunitySpacePersonTimePo;
import com.java110.po.reserveGoodsOrder.ReserveGoodsOrderPo;
import com.java110.po.reserveGoodsOrderTime.ReserveGoodsOrderTimePo;
import com.java110.utils.exception.CmdException;
@@ -44,7 +42,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.awt.color.CMMException;
import java.util.Arrays;
import java.util.Calendar;
import java.util.List;
@@ -85,7 +82,6 @@
Assert.hasKeyAndValue(reqJson, "receivedAmount", "璇锋眰鎶ユ枃涓湭鍖呭惈receivedAmount");
Assert.hasKeyAndValue(reqJson, "payWay", "璇锋眰鎶ユ枃涓湭鍖呭惈payWay");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
- Assert.hasKeyAndValue(reqJson, "extOrderId", "璇锋眰鎶ユ枃涓湭鍖呭惈extOrderId");
//鏍￠獙鏄惁鍙互棰勭害
ReserveGoodsDto reserveGoodsDto = new ReserveGoodsDto();
@@ -167,9 +163,9 @@
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) {
@@ -183,10 +179,11 @@
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