From 4f3b666cd625381e4acb07d8ae4d68ae9554b1b8 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 06 十一月 2023 18:12:49 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/cmd/question/SaveQuestionAnswerCmd.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/question/SaveQuestionAnswerCmd.java b/service-user/src/main/java/com/java110/user/cmd/question/SaveQuestionAnswerCmd.java
index e607d2f..72497c6 100644
--- a/service-user/src/main/java/com/java110/user/cmd/question/SaveQuestionAnswerCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/question/SaveQuestionAnswerCmd.java
@@ -31,7 +31,7 @@
import com.java110.user.bmo.question.IQuestionAnswerBMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
@@ -70,20 +70,17 @@
Assert.hasKey(reqJson, "roomIds", "璇锋眰鎶ユ枃涓湭鍖呭惈鎶曠エ鎴垮眿");
Assert.hasKeyAndValue(reqJson, "startTime", "鏈寘鍚紑濮嬫椂闂�");
Assert.hasKeyAndValue(reqJson, "endTime", "鏈寘鍚粨鏉熸椂闂�");
- Assert.hasKeyAndValue(reqJson, "content", "鏈寘鍚鏄�");
+ Assert.hasKeyAndValue(reqJson, "content", "鏈寘鍚皟鐮旇鏄�");
Assert.hasKey(reqJson, "questionTitles", "璇锋眰鎶ユ枃涓湭鍖呭惈棰樼洰");
-
JSONArray questionTitles = reqJson.getJSONArray("questionTitles");
if (questionTitles == null || questionTitles.size() < 1) {
throw new IllegalArgumentException("鏈寘鍚鐩�");
}
-
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
//todo 鍐欏叆鎶曠エ淇℃伅
QuestionAnswerPo questionAnswerPo = new QuestionAnswerPo();
questionAnswerPo.setContent(reqJson.getString("content"));
@@ -94,30 +91,34 @@
questionAnswerPo.setCommunityId(reqJson.getString("communityId"));
questionAnswerPo.setQaType(QuestionAnswerDto.QA_TYPE_QUESTION);
questionAnswerPo.setState(QuestionAnswerDto.STATE_WAIT);
+ if (!StringUtil.isEmpty(reqJson.getString("communityId"))) {
+ questionAnswerPo.setObjType("3306"); //3306 鏄皬鍖猴紝3307 鏄晢鎴�
+ questionAnswerPo.setObjId(reqJson.getString("communityId"));
+ } else if (!StringUtil.isEmpty(reqJson.getString("storeId"))) {
+ questionAnswerPo.setObjType("3307"); //3306 鏄皬鍖猴紝3307 鏄晢鎴�
+ questionAnswerPo.setObjId(reqJson.getString("storeId"));
+ }
int flag = questionAnswerV1InnerServiceSMOImpl.saveQuestionAnswer(questionAnswerPo);
-
if (flag < 1) {
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
JSONArray questionTitles = reqJson.getJSONArray("questionTitles");
JSONObject title = null;
for (int titleIndex = 0; titleIndex < questionTitles.size(); titleIndex++) {
- title= questionTitles.getJSONObject(titleIndex);
+ title = questionTitles.getJSONObject(titleIndex);
QuestionAnswerTitleRelPo questionAnswerTitleRelPo = new QuestionAnswerTitleRelPo();
questionAnswerTitleRelPo.setCommunityId(reqJson.getString("communityId"));
questionAnswerTitleRelPo.setTitleId(title.getString("titleId"));
questionAnswerTitleRelPo.setSeq((titleIndex + 1) + "");
questionAnswerTitleRelPo.setScore("0");
- if(title.containsKey("score")){
+ if (title.containsKey("score")) {
questionAnswerTitleRelPo.setScore(title.getString("score"));
}
questionAnswerTitleRelPo.setQaId(questionAnswerPo.getQaId());
questionAnswerTitleRelPo.setQatrId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
questionAnswerTitleRelV1InnerServiceSMOImpl.saveQuestionAnswerTitleRel(questionAnswerTitleRelPo);
}
-
questionAnswerBMOImpl.saveUserQuestionAnswer(questionAnswerPo, reqJson.getJSONArray("roomIds"));
-
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
}
--
Gitblit v1.8.0