From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/cmd/communitySpace/SaveCommunitySpacePersonCmd.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/communitySpace/SaveCommunitySpacePersonCmd.java b/service-community/src/main/java/com/java110/community/cmd/communitySpace/SaveCommunitySpacePersonCmd.java
index af5ba8e..f28cc50 100644
--- a/service-community/src/main/java/com/java110/community/cmd/communitySpace/SaveCommunitySpacePersonCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/communitySpace/SaveCommunitySpacePersonCmd.java
@@ -25,6 +25,7 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.doc.annotation.*;
import com.java110.dto.communitySpacePerson.CommunitySpacePersonDto;
+import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto;
import com.java110.intf.community.ICommunitySpacePersonTimeV1InnerServiceSMO;
import com.java110.intf.community.ICommunitySpacePersonV1InnerServiceSMO;
import com.java110.po.communitySpacePerson.CommunitySpacePersonPo;
@@ -60,6 +61,9 @@
@Java110ParamDoc(name = "receivableAmount", length = 30, remark = "搴旀敹閲戦"),
@Java110ParamDoc(name = "receivedAmount", length = 30, remark = "瀹炴敹閲戦"),
@Java110ParamDoc(name = "spaceId", length = 30, remark = "鍦哄湴ID"),
+ @Java110ParamDoc(name = "openTimes",type="Array", length = 30, remark = "鍦哄湴ID"),
+ @Java110ParamDoc(parentNodeName = "openTimes",name = "hours", length = 30, remark = "棰勭害鏃堕棿"),
+
})
@Java110ResponseDoc(
@@ -109,6 +113,34 @@
Assert.hasKeyAndValue(reqJson, "payWay", "璇锋眰鎶ユ枃涓湭鍖呭惈payWay");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
+ if(!reqJson.containsKey("openTimes")){
+ cmdDataFlowContext.setResponseEntity(ResultVo.success());
+ return ;
+ }
+
+ JSONArray openTimes = reqJson.getJSONArray("openTimes");
+
+ if(openTimes == null || openTimes.size() <1){
+ cmdDataFlowContext.setResponseEntity(ResultVo.success());
+ return ;
+ }
+ CommunitySpacePersonTimeDto communitySpacePersonTimeDto = null;
+ int flag = 0;
+ for(int timeIndex = 0 ;timeIndex < openTimes.size(); timeIndex++) {
+ if("N".equals(openTimes.getJSONObject(timeIndex).getString("isOpen"))){
+ continue;
+ }
+ communitySpacePersonTimeDto = new CommunitySpacePersonTimeDto();
+ communitySpacePersonTimeDto.setCommunityId(reqJson.getString("communityId"));
+ communitySpacePersonTimeDto.setAppointmentTime(reqJson.getString("appointmentTime"));
+ communitySpacePersonTimeDto.setHours(openTimes.getJSONObject(timeIndex).getString("hours"));
+ communitySpacePersonTimeDto.setSpaceId(reqJson.getString("spaceId"));
+ flag = communitySpacePersonTimeV1InnerServiceSMOImpl.queryCommunitySpacePersonTimesCount(communitySpacePersonTimeDto);
+ if(flag > 0){
+ throw new CmdException(reqJson.getString("appointmentTime")+","+openTimes.getJSONObject(timeIndex).getString("hours")+"宸茬粡琚绾�");
+ }
+ }
+
}
@Override
@@ -119,6 +151,7 @@
CommunitySpacePersonPo communitySpacePersonPo = BeanConvertUtil.covertBean(reqJson, CommunitySpacePersonPo.class);
communitySpacePersonPo.setCspId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ communitySpacePersonPo.setOrderId(GenerateCodeFactory.getGeneratorId("11"));
if(StringUtil.isEmpty(communitySpacePersonPo.getState())){
communitySpacePersonPo.setState(CommunitySpacePersonDto.STATE_W);
}
@@ -150,6 +183,7 @@
communitySpacePersonTimePo.setHours(openTimes.getJSONObject(timeIndex).getString("hours"));
communitySpacePersonTimePo.setSpaceId(communitySpacePersonPo.getSpaceId());
communitySpacePersonTimePo.setTimeId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ communitySpacePersonTimePo.setState(CommunitySpacePersonTimeDto.STATE_WAIT_CONFIRM);
communitySpacePersonTimeV1InnerServiceSMOImpl.saveCommunitySpacePersonTime(communitySpacePersonTimePo);
}
--
Gitblit v1.8.0