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/SaveCommunitySpaceConfirmOrderCmd.java | 79 ++++++++++++++++++++++++++-------------
1 files changed, 53 insertions(+), 26 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/communitySpace/SaveCommunitySpaceConfirmOrderCmd.java b/service-community/src/main/java/com/java110/community/cmd/communitySpace/SaveCommunitySpaceConfirmOrderCmd.java
index 3117bb3..c8b4c29 100644
--- a/service-community/src/main/java/com/java110/community/cmd/communitySpace/SaveCommunitySpaceConfirmOrderCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/communitySpace/SaveCommunitySpaceConfirmOrderCmd.java
@@ -23,15 +23,21 @@
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.doc.annotation.*;
+import com.java110.dto.communitySpaceConfirmOrder.CommunitySpaceConfirmOrderDto;
+import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto;
import com.java110.intf.community.ICommunitySpaceConfirmOrderV1InnerServiceSMO;
+import com.java110.intf.community.ICommunitySpacePersonTimeV1InnerServiceSMO;
import com.java110.po.communitySpaceConfirmOrder.CommunitySpaceConfirmOrderPo;
+import com.java110.po.communitySpacePersonTime.CommunitySpacePersonTimePo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
@Java110CmdDoc(title = "鍦哄湴棰勭害鏍搁攢",
@@ -44,8 +50,7 @@
)
@Java110ParamsDoc(params = {
- @Java110ParamDoc(name = "page", type = "int", length = 11, remark = "鍒嗛〉椤垫暟"),
- @Java110ParamDoc(name = "row", type = "int", length = 11, remark = "鍒嗛〉琛屾暟"),
+ @Java110ParamDoc(name = "timeId", length = 11, remark = "棰勭害鏃堕棿ID"),
@Java110ParamDoc(name = "communityId", length = 30, remark = "灏忓尯ID"),
})
@@ -54,23 +59,22 @@
@Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
@Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
@Java110ParamDoc(name = "data", type = "Array", remark = "鏈夋晥鏁版嵁"),
- @Java110ParamDoc(parentNodeName = "data", name = "communityId", type = "String", remark = "灏忓尯ID"),
- @Java110ParamDoc(parentNodeName = "data", name = "name", type = "String", remark = "鍦哄湴鍚嶇О"),
- @Java110ParamDoc(parentNodeName = "data", name = "state", type = "String", remark = "灏忓尯鐘舵�� 1001 鍙绾︾姸鎬� 2002 涓嶅彲浠ラ绾︾姸鎬�"),
- @Java110ParamDoc(parentNodeName = "data", name = "startTime", type = "String", remark = "棰勭害寮�濮嬫椂闂�"),
- @Java110ParamDoc(parentNodeName = "data", name = "endTime", type = "String", remark = "棰勭害缁撴潫鏃堕棿"),
- @Java110ParamDoc(parentNodeName = "data", name = "feeMoney", type = "String", remark = "姣忓皬鏃惰垂鐢�"),
- @Java110ParamDoc(parentNodeName = "data", name = "adminName", type = "String", remark = "绠＄悊鍛�"),
- @Java110ParamDoc(parentNodeName = "data", name = "tel", type = "String", remark = "鑱旂郴鐢佃瘽"),
- @Java110ParamDoc(parentNodeName = "data", name = "openTimes", type = "Array", remark = "鑱旂郴鐢佃瘽"),
- @Java110ParamDoc(parentNodeName = "openTimes", name = "hours", type = "String", remark = "灏忔椂"),
- @Java110ParamDoc(parentNodeName = "openTimes", name = "isOpen", type = "String", remark = "鏄惁棰勭害 Y 鍙互棰勭害 N 涓嶈兘棰勭害"),
+ @Java110ParamDoc(parentNodeName = "data", name = "appointmentTime", type = "String", remark = "棰勭害鏃堕棿"),
+ @Java110ParamDoc(parentNodeName = "data", name = "remark", type = "String", remark = "澶囨敞"),
+ @Java110ParamDoc(parentNodeName = "data", name = "createTime", type = "String", remark = "鏍搁攢鏃堕棿"),
+ @Java110ParamDoc(parentNodeName = "data", name = "hours", type = "String", remark = "鏍搁攢灏忔椂"),
+ @Java110ParamDoc(parentNodeName = "data", name = "spaceName", type = "String", remark = "鍦哄湴"),
+ @Java110ParamDoc(parentNodeName = "data", name = "personName", type = "String", remark = "棰勭害浜�"),
+ @Java110ParamDoc(parentNodeName = "data", name = "personTel", type = "String", remark = "棰勭害鐢佃瘽"),
}
)
@Java110ExampleDoc(
- reqBody = "http://{ip}:{port}/app/communitySpace.listCommunitySpaceConfirmOrder?spaceId=&name=&state=&communityId=2022081539020475&page=1&row=10",
- resBody = "{\"code\":0,\"data\":[{\"adminName\":\"鏃犻渶鏂嘰",\"communityId\":\"2022081539020475\",\"endTime\":\"06:10\",\"feeMoney\":\"10.00\",\"name\":\"浣撹偛鍦篭",\"page\":-1,\"records\":0,\"row\":0,\"spaceId\":\"102022093043260007\",\"startTime\":\"05:05\",\"state\":\"1001\",\"statusCd\":\"0\",\"tel\":\"18909711443\",\"total\":0,\"openTimes\":[{\"hours\":0,\"Y\"}]}],\"msg\":\"鎴愬姛\",\"page\":0,\"records\":1,\"rows\":0,\"total\":2}"
+ reqBody = "{\n" +
+ " timeId: '123',\n" +
+ " communityId: '2123123123'\n" +
+ "}",
+ resBody = "{\"code\":0,\"data\":[{\"appointmentTime\":\"2022-10-04\",\"communityId\":\"2022081539020475\",\"createTime\":\"2022-10-14 17:51:27\",\"cspId\":\"102022100465470002\",\"hours\":\"0\",\"orderId\":\"102022101460720007\",\"page\":-1,\"personName\":\"寮犱笁\",\"personTel\":\"18909711445\",\"records\":0,\"row\":0,\"spaceId\":\"102022100486970002\",\"spaceName\":\"1鍦哄湴\",\"statusCd\":\"0\",\"timeId\":\"102022100469010004\",\"total\":0}],\"msg\":\"鎴愬姛\",\"page\":0,\"records\":1,\"rows\":0,\"total\":1}"
)
/**
@@ -93,27 +97,50 @@
@Autowired
private ICommunitySpaceConfirmOrderV1InnerServiceSMO communitySpaceConfirmOrderV1InnerServiceSMOImpl;
+ @Autowired
+ private ICommunitySpacePersonTimeV1InnerServiceSMO communitySpacePersonTimeV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "cspId", "璇锋眰鎶ユ枃涓湭鍖呭惈cspId");
-Assert.hasKeyAndValue(reqJson, "timeId", "璇锋眰鎶ユ枃涓湭鍖呭惈timeId");
-Assert.hasKeyAndValue(reqJson, "spaceId", "璇锋眰鎶ユ枃涓湭鍖呭惈spaceId");
-Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
-
+ Assert.hasKeyAndValue(reqJson, "timeId", "璇锋眰鎶ユ枃涓湭鍖呭惈timeId");
+ Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- CommunitySpaceConfirmOrderPo communitySpaceConfirmOrderPo = BeanConvertUtil.covertBean(reqJson, CommunitySpaceConfirmOrderPo.class);
- communitySpaceConfirmOrderPo.setOrderId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
- int flag = communitySpaceConfirmOrderV1InnerServiceSMOImpl.saveCommunitySpaceConfirmOrder(communitySpaceConfirmOrderPo);
+ CommunitySpacePersonTimeDto communitySpacePersonTimeDto = new CommunitySpacePersonTimeDto();
+ communitySpacePersonTimeDto.setTimeId(reqJson.getString("timeId"));
+ communitySpacePersonTimeDto.setCommunityId(reqJson.getString("communityId"));
+ communitySpacePersonTimeDto.setState(CommunitySpacePersonTimeDto.STATE_WAIT_CONFIRM);
+ List<CommunitySpacePersonTimeDto> communitySpacePersonTimeDtos = communitySpacePersonTimeV1InnerServiceSMOImpl.queryCommunitySpacePersonTimes(communitySpacePersonTimeDto);
+ Assert.listOnlyOne(communitySpacePersonTimeDtos, "鏈寘鍚绾﹁褰�");
+
+ //灏� 鏃堕棿淇敼 鏍搁攢涓�
+ CommunitySpacePersonTimePo communitySpacePersonTimePo = new CommunitySpacePersonTimePo();
+ communitySpacePersonTimePo.setTimeId(communitySpacePersonTimeDtos.get(0).getTimeId());
+ communitySpacePersonTimePo.setState(CommunitySpacePersonTimeDto.STATE_FINISH);
+ int flag = communitySpacePersonTimeV1InnerServiceSMOImpl.updateCommunitySpacePersonTime(communitySpacePersonTimePo);
if (flag < 1) {
- throw new CmdException("淇濆瓨鏁版嵁澶辫触");
+ throw new CmdException("鏍搁攢棰勭害澶辫触");
}
- cmdDataFlowContext.setResponseEntity(ResultVo.success());
+ CommunitySpaceConfirmOrderPo communitySpaceConfirmOrderPo = BeanConvertUtil.covertBean(reqJson, CommunitySpaceConfirmOrderPo.class);
+ communitySpaceConfirmOrderPo.setOrderId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ communitySpaceConfirmOrderPo.setSpaceId(communitySpacePersonTimeDtos.get(0).getSpaceId());
+ communitySpaceConfirmOrderPo.setCspId(communitySpacePersonTimeDtos.get(0).getCspId());
+
+ flag = communitySpaceConfirmOrderV1InnerServiceSMOImpl.saveCommunitySpaceConfirmOrder(communitySpaceConfirmOrderPo);
+ if (flag < 1) {
+ throw new CmdException("鏍搁攢鏁版嵁澶辫触");
+ }
+ CommunitySpaceConfirmOrderDto communitySpaceConfirmOrderDto = new CommunitySpaceConfirmOrderDto();
+ communitySpaceConfirmOrderDto.setOrderId(communitySpaceConfirmOrderPo.getOrderId());
+ List<CommunitySpaceConfirmOrderDto> communitySpaceConfirmOrderDtos = communitySpaceConfirmOrderV1InnerServiceSMOImpl.queryCommunitySpaceConfirmOrders(communitySpaceConfirmOrderDto);
+
+
+ cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(communitySpaceConfirmOrderDtos));
}
}
--
Gitblit v1.8.0