Commit 31d456f2 by zhiwj

修改bug

parent 7fe5592d
......@@ -11,7 +11,6 @@ import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.enterprise.service.EnterpriseApiService;
import com.gic.evaluate.constant.Constants;
import com.gic.evaluate.constant.ReplyEnum;
import com.gic.evaluate.constant.ReplyerTypeEnum;
import com.gic.evaluate.dto.EvaluateDTO;
import com.gic.evaluate.dto.EvaluateQuickDTO;
import com.gic.evaluate.dto.EvaluateReplyDTO;
......@@ -93,22 +92,22 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
}
evaluateDTO.setReplyList(replyDTOList);
EvaluateReplyDTO evaluateReplyDTO = new EvaluateReplyDTO();
evaluateReplyDTO.setEvaluateId(evaluateDTO.getEvaluateId());
evaluateReplyDTO.setReplyDate(evaluateDTO.getEvaluateTime());
evaluateReplyDTO.setReplyerType(ReplyerTypeEnum.MEMBER.getCode());
evaluateReplyDTO.setReplyContent(evaluateDTO.getEvaluateContent());
evaluateReplyDTO.setMemberId(evaluateDTO.getMemberId());
evaluateReplyDTO.setMemberName(evaluateDTO.getMemberName());
evaluateReplyDTO.setMemberImgUrl(evaluateDTO.getMemberImgUrl());
evaluateReplyDTO.setImgList(evaluateDTO.getImgList());
evaluateReplyDTO.setShowStatus(evaluateDTO.getShowStatus());
List<EvaluateReplyDTO> replyList = evaluateDTO.getReplyList();
if (replyList == null) {
replyList = new ArrayList<>();
} else {
replyList.add(0, evaluateReplyDTO);
}
// EvaluateReplyDTO evaluateReplyDTO = new EvaluateReplyDTO();
// evaluateReplyDTO.setEvaluateId(evaluateDTO.getEvaluateId());
// evaluateReplyDTO.setReplyDate(evaluateDTO.getEvaluateTime());
// evaluateReplyDTO.setReplyerType(ReplyerTypeEnum.MEMBER.getCode());
// evaluateReplyDTO.setReplyContent(evaluateDTO.getEvaluateContent());
// evaluateReplyDTO.setMemberId(evaluateDTO.getMemberId());
// evaluateReplyDTO.setMemberName(evaluateDTO.getMemberName());
// evaluateReplyDTO.setMemberImgUrl(evaluateDTO.getMemberImgUrl());
// evaluateReplyDTO.setImgList(evaluateDTO.getImgList());
// evaluateReplyDTO.setShowStatus(evaluateDTO.getShowStatus());
// List<EvaluateReplyDTO> replyList = evaluateDTO.getReplyList();
// if (replyList == null) {
// replyList = new ArrayList<>();
// } else {
// replyList.add(0, evaluateReplyDTO);
// }
return EnterpriseServiceResponse.success(evaluateDTO);
}
......
......@@ -12,6 +12,7 @@ import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.evaluate.constant.Constants;
import com.gic.evaluate.constant.OrderReplyEnum;
import com.gic.evaluate.constant.ReplyEnum;
import com.gic.evaluate.constant.ReplyerTypeEnum;
import com.gic.evaluate.dto.EvaluateDTO;
import com.gic.evaluate.dto.EvaluateReplyDTO;
import com.gic.evaluate.dto.MemberReplyDTO;
......@@ -156,9 +157,29 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
Integer evaluateId = evaluateService.saveEvaluate(evaluateDTO);
if (evaluateId != null) {
EvaluateReplyDTO evaluateReplyDTO = new EvaluateReplyDTO();
evaluateReplyDTO.setEvaluateId(evaluateId);
evaluateReplyDTO.setReplyDate(evaluateDTO.getEvaluateTime());
evaluateReplyDTO.setReplyerType(ReplyerTypeEnum.MEMBER.getCode());
evaluateReplyDTO.setReplyContent(evaluateDTO.getEvaluateContent());
evaluateReplyDTO.setMemberId(evaluateDTO.getMemberId());
evaluateReplyDTO.setMemberName(evaluateDTO.getMemberName());
evaluateReplyDTO.setMemberImgUrl(evaluateDTO.getMemberImgUrl());
evaluateReplyDTO.setShowStatus(Constants.OPEN);
MemberReplyDTO memberReplyDTO = new MemberReplyDTO();
memberReplyDTO.setEnterpriseId(evaluateDTO.getEnterpriseId());
memberReplyDTO.setEvaluateId(evaluateDTO.getEvaluateId());
memberReplyDTO.setReplyContent(evaluateDTO.getEvaluateContent());
memberReplyDTO.setMemberId(evaluateDTO.getMemberId());
memberReplyDTO.setMemberName(evaluateDTO.getMemberName());
memberReplyDTO.setAcuId(evaluateDTO.getAcuId());
memberReplyDTO.setEcuId(evaluateDTO.getEcuId());
Integer evaluateReplyId = evaluateReplyService.saveMemberReplyEvaluate(memberReplyDTO);
if (CollectionUtils.isNotEmpty(evaluateDTO.getImgList())) {
evaluateImgService.saveList(evaluateDTO.getEnterpriseId(), evaluateId, evaluateDTO.getImgList());
evaluateImgService.saveList(evaluateDTO.getEnterpriseId(), evaluateId, evaluateReplyId, evaluateDTO.getImgList());
}
TabEvaluateMsgLog evaluateMsgLog = evaluateMsgLogService.getByOrderId(evaluateDTO.getOrderId());
if (evaluateMsgLog != null) {
evaluateMsgLog.setFirstStatus(0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment