评价

haoban-manage3-wx/pom.xml

@@ -226,6 +226,11 @@
             <artifactId>gic-store-goods-api</artifactId>
             <version>${gic-store-goods-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-evaluate-manage-api</artifactId>
+            <version>${gic-evaluate-manage-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -7,6 +7,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -47,6 +49,9 @@ import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.evaluate.manage.api.dto.EvaluateRuleScoreDTO;
+import com.gic.evaluate.manage.api.dto.StoreEvaluateInfoDTO;
+import com.gic.evaluate.manage.api.service.EvaluateDataApiService;
 import com.gic.haoban.app.aggregation.api.dto.evaluation.CreateRecordRequest;
 import com.gic.haoban.app.aggregation.api.dto.evaluation.OrderProductRequest;
 import com.gic.haoban.app.aggregation.api.dto.evaluation.OrderVerificationRecordDTO;
@@ -54,6 +59,7 @@ import com.gic.haoban.app.aggregation.api.service.evaluation.OrderVerificationRe
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.order.integral.ClerkQo;
+import com.gic.haoban.manage.web.vo.order.EvaluateVO;
 import com.gic.haoban.manage.web.vo.order.MemberInfoVO;
 import com.gic.haoban.manage.web.vo.order.OrderCountVO;
 import com.gic.haoban.manage.web.vo.order.OrderDetailItemVO;
@@ -95,6 +101,8 @@ public class GicOrderController {
     private OrderSettingApiService orderSettingApiService;
     @Autowired
     private AfterSalesManageApiService afterSalesManageApiService;
+    @Autowired
+    private EvaluateDataApiService evaluateDataApiService;
 
     // 发货订单列表 (0全部,待发货2+待收货3,部分发货7)
     @RequestMapping("list-order")
@@ -130,7 +138,6 @@ public class GicOrderController {
         qdto.setOrderStep("" + status);
         qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
         qdto.setSearchOrderParam(search);
-
         return this.orderListSelect(qdto, pageInfo);
     }
 
@@ -142,9 +149,11 @@ public class GicOrderController {
         if (ret.isSuccess()) {
             Page<ListOrderDTO> page = ret.getResult();
             List<OrderListVO> voList = new ArrayList<>();
+            List<String> orderIdList = new ArrayList<>();
             if (CollectionUtils.isNotEmpty(page.getResult())) {
                 List<ListOrderDTO> orderList = page.getResult();
                 for (ListOrderDTO order : orderList) {
+                    orderIdList.add(order.getOrderId());
                     OrderListVO vo = EntityUtil.changeEntityNew(OrderListVO.class, order);
                     List<ListOrderItemDTO> itemList = order.getOrderItemDTOList();
                     List<OrderListItemVO> voItemList = EntityUtil.changeEntityListNew(OrderListItemVO.class, itemList);
@@ -154,6 +163,27 @@ public class GicOrderController {
                 }
             }
             Page<OrderListVO> retPage = PageHelperUtils.changePageToCurrentPage(ret.getResult(), OrderListVO.class);
+            String enterpriseId = qdto.getEnterpriseId();
+            // 评价
+            ServiceResponse<List<StoreEvaluateInfoDTO>> evaluateResp = evaluateDataApiService
+                    .getEvaluateScoreAndContent(enterpriseId, orderIdList);
+            Map<String, List<EvaluateVO>> evaluateMap = Optional.ofNullable(evaluateResp)
+                    .map(ServiceResponse::getResult).orElse(new ArrayList<>()).stream().map(data -> {
+                        EvaluateVO evaluateVO = new EvaluateVO();
+                        String evaluateContent = data.getEvaluateContent();
+                        evaluateVO.setEvaluateScoreList(new ArrayList<>());
+                        if (CollectionUtils.isNotEmpty(data.getEvaluateRuleScores())) {
+                            for (EvaluateRuleScoreDTO evaluateScoresDTO : data.getEvaluateRuleScores()) {
+                                EvaluateVO.EvaluateScore evaluateScore = new EvaluateVO.EvaluateScore();
+                                evaluateScore.setName(evaluateScoresDTO.getRuleName());
+                                evaluateScore.setValue(evaluateScoresDTO.getScore());
+                                evaluateVO.getEvaluateScoreList().add(evaluateScore);
+                            }
+                        }
+                        evaluateVO.setReviews(evaluateContent);
+                        evaluateVO.setOrderId(data.getOrderId());
+                        return evaluateVO;
+                    }).collect(Collectors.groupingBy(EvaluateVO::getOrderId));
             voList.forEach(item -> {
                 String clerkId = item.getBelongClerkId();
                 if (StringUtils.isNotEmpty(clerkId)) {
@@ -162,6 +192,9 @@ public class GicOrderController {
                         item.setBelongClerkName(clerkDTO.getClerkName());
                     }
                 }
+                if (null != evaluateMap.get(item.getOrderId())) {
+                    item.setEvaluateVO(evaluateMap.get(item.getOrderId()).get(0));
+                }
             });
             retPage.setResult(voList);
             return RestResponse.successResult(retPage);
@@ -323,7 +356,6 @@ public class GicOrderController {
                 if (stockResp.isSuccess() && null != stockResp.getResult()) {
                     vo.setStoreStock(stockResp.getResult());
                 }
-
                 voList.add(vo);
             }
         }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/EvaluateVO.java

+package com.gic.haoban.manage.web.vo.order;
+
+import java.util.List;
+
+/**
+ * 订单评价
+ */
+public class EvaluateVO {
+
+    private String orderId;
+
+    /**
+     * 评语
+     */
+    private String reviews;
+
+    /**
+     * 纬度评分
+     */
+    private List<EvaluateScore> evaluateScoreList;
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getReviews() {
+        return reviews;
+    }
+
+    public void setReviews(String reviews) {
+        this.reviews = reviews;
+    }
+
+    public List<EvaluateScore> getEvaluateScoreList() {
+        return evaluateScoreList;
+    }
+
+    public void setEvaluateScoreList(List<EvaluateScore> evaluateScoreList) {
+        this.evaluateScoreList = evaluateScoreList;
+    }
+
+    public static class EvaluateScore{
+
+        private String name;
+
+        private Double value;
+
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Double getValue() {
+            return value;
+        }
+
+        public void setValue(Double value) {
+            this.value = value;
+        }
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/OrderListVO.java

@@ -77,6 +77,19 @@ public class OrderListVO implements Serializable {
     // 应付总额
     private Double mallProAllPrice ;
     
+    /**
+     * 评价
+     */
+    private EvaluateVO evaluateVO;
+    
+    public EvaluateVO getEvaluateVO() {
+        return evaluateVO;
+    }
+
+    public void setEvaluateVO(EvaluateVO evaluateVO) {
+        this.evaluateVO = evaluateVO;
+    }
+
     public Double getMallProAllPrice() {
         return mallProAllPrice;
     }

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -133,5 +133,6 @@
 	<dubbo:reference id="memberReferClerkApiService" interface="com.gic.business.order.service.activity.MemberReferClerkApiService" timeout="100000" retries="0" check="false" />
 	<dubbo:reference id="productStockApiService" interface="com.gic.store.goods.service.ProductStockApiService" timeout="100000" retries="0" check="false" />
 	<dubbo:reference id="orderSettingApiService" interface="com.gic.business.order.service.setting.OrderSettingApiService" timeout="100000" retries="0" check="false" />
+	<dubbo:reference id="evaluateDataApiService" interface="com.gic.evaluate.manage.api.service.EvaluateDataApiService" timeout="100000" retries="0" check="false" />
 	
 </beans>