提交订单

gic-evaluate-api/src/main/java/com/gic/evaluate/qo/EvaluateOutQO.java

@@ -13,10 +13,8 @@ public class EvaluateOutQO implements Serializable {
 
     private Integer enterpriseId;
 
-    /**
-     * mcuId
-     */
-    private Long memberId;
+    private Long orderId;
+
     public Integer getEnterpriseId() {
         return enterpriseId;
     }
@@ -25,12 +23,11 @@ public class EvaluateOutQO implements Serializable {
         this.enterpriseId = enterpriseId;
     }
 
-    public Long getMemberId() {
-        return memberId;
+    public Long getOrderId() {
+        return orderId;
     }
 
-    public void setMemberId(Long memberId) {
-        this.memberId = memberId;
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
     }
-
 }

gic-evaluate-api/src/main/java/com/gic/evaluate/service/EvaluateOutApiService.java

@@ -57,7 +57,18 @@ public interface EvaluateOutApiService {
      * @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.evaluate.dto.EvaluateDTO>>
      * @throws
      */
-    ServiceResponse<List<EvaluateDTO>> listEvaluateByMember(EvaluateOutQO evaluateOutQO);
+//    ServiceResponse<List<EvaluateDTO>> listEvaluateByMember(EvaluateOutQO evaluateOutQO);
+
+    /**
+     * 查询订单的所有评价
+     * @Title: listEvaluateByOrderId
+     * @Description:
+     * @author zhiwj
+     * @param evaluateOutQO
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.evaluate.dto.EvaluateDTO>>
+     * @throws
+     */
+    ServiceResponse<EvaluateDTO> listEvaluateByOrderId(EvaluateOutQO evaluateOutQO);
 
     /**
      * 查询订单号对应的回复状态 key是订单号， value是状态（-1:未评价  0管理员没有回复过  1管理员回复了   2有新的追评管理员没回复  3逾期不可评价    4不支持追评    5超过评价期限   6超过最大追评次数 ）

gic-evaluate-service/pom.xml

@@ -124,6 +124,11 @@
             <artifactId>gic-order-api</artifactId>
             <version>${gic-order-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic </groupId>
+            <artifactId>gic-marketing-process-api</artifactId>
+            <version>${gic-marketing-process-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -14,8 +14,8 @@ import com.gic.evaluate.dto.EvaluateReplyDTO;
 import com.gic.evaluate.dto.MemberReplyDTO;
 import com.gic.evaluate.entity.*;
 import com.gic.evaluate.qo.EvaluateOutQO;
-import com.gic.evaluate.qo.EvaluateQO;
 import com.gic.evaluate.service.*;
+import com.gic.marketing.process.api.dto.notice.MQNoticeSendDTO;
 import com.gic.member.api.dto.AcuDetailDTO;
 import com.gic.member.api.dto.MemberUserDTO;
 import com.gic.member.api.service.CuDetailService;
@@ -63,6 +63,8 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
     private OrderApiService orderApiService;
     @Autowired
     private StoreApiService storeApiService;
+//    @Autowired
+//    private NoticeRouterApiService noticeRouterApiService;
 
     @Override
     public ServiceResponse<Void> saveEvaluate(EvaluateDTO evaluateDTO) {
@@ -185,37 +187,63 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         return null;
     }
 */
+//
+//    @Override
+//    public ServiceResponse<List<EvaluateDTO>> listEvaluateByMember(EvaluateOutQO evaluateOutQO) {
+//        EvaluateQO evaluateQO = new EvaluateQO();
+//        evaluateQO.setEnterpriseId(evaluateOutQO.getEnterpriseId());
+//        evaluateQO.setMemberId(evaluateOutQO.getMemberId());
+//        evaluateQO.setShowStatus(Constants.OPEN);
+//        List<TabEvaluate> evaluateList = this.evaluateService.listEvaluate(evaluateQO);
+//        if (CollectionUtils.isEmpty(evaluateList)) {
+//            return EnterpriseServiceResponse.success(Collections.emptyList());
+//        }
+//        List<EvaluateDTO> evaluateDTOList = EntityUtil.changeEntityListByJSON(EvaluateDTO.class, evaluateList);
+////        List<Integer> evaluateIdList = evaluateDTOList.stream().map(EvaluateDTO::getEvaluateId).collect(Collectors.toList());
+//        // 有空去掉循环
+//        for (EvaluateDTO evaluateDTO : evaluateDTOList) {
+//            // 图片
+//            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> evaluateReplyList = this.evaluateReplyService.listEvaluateReply(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId());
+//            List<EvaluateReplyDTO> replyDTOList = EntityUtil.changeEntityListByJSON(EvaluateReplyDTO.class, evaluateReplyList);
+//            // 追评和回复的图片
+//            for (EvaluateReplyDTO replyDTO : replyDTOList) {
+//                List<TabEvaluateImg> evaluateReplyImgList = evaluateImgService.listImageByEvaluateReplyId(replyDTO.getEvaluateReplyId());
+//                List<String> replyImgList = Optional.ofNullable(evaluateReplyImgList).orElse(Collections.emptyList()).stream().map(TabEvaluateImg::getImgUrl).collect(Collectors.toList());
+//                replyDTO.setImgList(replyImgList);
+//            }
+//            evaluateDTO.setReplyList(replyDTOList);
+//        }
+//        return EnterpriseServiceResponse.success(evaluateDTOList);
+//    }
 
     @Override
-    public ServiceResponse<List<EvaluateDTO>> listEvaluateByMember(EvaluateOutQO evaluateOutQO) {
-        EvaluateQO evaluateQO = new EvaluateQO();
-        evaluateQO.setEnterpriseId(evaluateOutQO.getEnterpriseId());
-        evaluateQO.setMemberId(evaluateOutQO.getMemberId());
-        evaluateQO.setShowStatus(Constants.OPEN);
-        List<TabEvaluate> evaluateList = this.evaluateService.listEvaluate(evaluateQO);
-        if (CollectionUtils.isEmpty(evaluateList)) {
-            return EnterpriseServiceResponse.success(Collections.emptyList());
+    public ServiceResponse<EvaluateDTO> listEvaluateByOrderId(EvaluateOutQO evaluateOutQO) {
+        TabEvaluate evaluate = this.evaluateService.getEvaluateByOrderId(evaluateOutQO.getEnterpriseId(), evaluateOutQO.getOrderId());
+        if (evaluate == null) {
+            return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
         }
-        List<EvaluateDTO> evaluateDTOList = EntityUtil.changeEntityListByJSON(EvaluateDTO.class, evaluateList);
-//        List<Integer> evaluateIdList = evaluateDTOList.stream().map(EvaluateDTO::getEvaluateId).collect(Collectors.toList());
-        // 有空去掉循环
-        for (EvaluateDTO evaluateDTO : evaluateDTOList) {
-            // 图片
-            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> evaluateReplyList = this.evaluateReplyService.listEvaluateReply(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId());
-            List<EvaluateReplyDTO> replyDTOList = EntityUtil.changeEntityListByJSON(EvaluateReplyDTO.class, evaluateReplyList);
-            // 追评和回复的图片
-            for (EvaluateReplyDTO replyDTO : replyDTOList) {
-                List<TabEvaluateImg> evaluateReplyImgList = evaluateImgService.listImageByEvaluateReplyId(replyDTO.getEvaluateReplyId());
-                List<String> replyImgList = Optional.ofNullable(evaluateReplyImgList).orElse(Collections.emptyList()).stream().map(TabEvaluateImg::getImgUrl).collect(Collectors.toList());
-                replyDTO.setImgList(replyImgList);
-            }
-            evaluateDTO.setReplyList(replyDTOList);
+
+        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> evaluateReplyList = this.evaluateReplyService.listEvaluateReply(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId());
+        List<EvaluateReplyDTO> replyDTOList = EntityUtil.changeEntityListByJSON(EvaluateReplyDTO.class, evaluateReplyList);
+        // 追评和回复的图片
+        for (EvaluateReplyDTO replyDTO : replyDTOList) {
+            List<TabEvaluateImg> evaluateReplyImgList = evaluateImgService.listImageByEvaluateReplyId(replyDTO.getEvaluateReplyId());
+            List<String> replyImgList = Optional.ofNullable(evaluateReplyImgList).orElse(Collections.emptyList()).stream().map(TabEvaluateImg::getImgUrl).collect(Collectors.toList());
+            replyDTO.setImgList(replyImgList);
         }
-        return EnterpriseServiceResponse.success(evaluateDTOList);
+        evaluateDTO.setReplyList(replyDTOList);
+
+        return EnterpriseServiceResponse.success(evaluateDTO);
     }
 
     @Override
@@ -252,6 +280,26 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
             }
         }
 
+
+        // todo 发送评价
+        MQNoticeSendDTO notice = new MQNoticeSendDTO();
+
+        // todo
+//        //企业ID
+//        notice.setEnterpriseId(enterpriseId);
+//        //会员卡域id
+//        notice.setMemberAreaId(memberAreaId);
+//        //事件code
+//        notice.setNoticeCode(NoticeConstant.NOTICE_ORDER_EVALUATE);
+//        //会员ecuId
+//        notice.setEcuId(1L);
+//        Map <String, String> valueMap = new HashMap <>();
+//        valueMap.put(NoticeConstant.PARAMS_VERIFY_CODE, verifyCode);
+//        // 事件需要的事件级变量 ，具体变量参考附件
+//        notice.setValueMap(valueMap);
+//        this.noticeRouterApiService.putNoticeSendRouter(notice);
+
+
         return EnterpriseServiceResponse.success(resultMap);
     }