From 7cd9cc73b6bbae05e8fa734e29f6cd435e2599ba Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 28 六月 2023 14:27:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-store/src/main/java/com/java110/store/cmd/reserveOrder/SaveReserveGoodsOrderCmd.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 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 5c2ff90..4b369ea 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,17 +23,15 @@
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.po.reserve.ReserveGoodsOrderPo;
+import com.java110.po.reserve.ReserveGoodsOrderTimePo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -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;
@@ -166,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) {
@@ -186,7 +183,7 @@
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