接受订单信息

gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateManageApiServiceImpl.java

@@ -8,6 +8,7 @@ import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseServiceResponse;
 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;
@@ -63,6 +64,11 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
             return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
         }
         EvaluateDTO evaluateDTO = EntityUtil.changeEntityByJSON(EvaluateDTO.class, evaluate);
+
+        List<TabEvaluateImg> evaluateImgList = evaluateImgService.listImageByEvaluateId(evaluateDTO.getEvaluateId());
+        List<String> imgList = Optional.ofNullable(evaluateImgList).orElse(Collections.emptyList()).stream().map(TabEvaluateImg::getImgUrl).collect(Collectors.toList());
+        evaluateDTO.setImgList(imgList);
+
         List<TabEvaluateReply> tabReplyList = evaluateReplyService.listEvaluateReply(enterpriseId, evaluateId);
         List<EvaluateReplyDTO> replyDTOList = EntityUtil.changeEntityListByJSON(EvaluateReplyDTO.class, tabReplyList);
         for (EvaluateReplyDTO evaluateReplyDTO : replyDTOList) {
@@ -71,6 +77,24 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
             evaluateReplyDTO.setImgList(replyImgList);
         }
         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());
+
+        List<EvaluateReplyDTO> replyList = evaluateDTO.getReplyList();
+        if (replyList == null) {
+            replyList = new ArrayList<>();
+        } else {
+            replyList.add(0, evaluateReplyDTO);
+        }
+
         return EnterpriseServiceResponse.success(evaluateDTO);
     }