Merge remote-tracking branch 'origin/master' into 3.5

# Conflicts:
#	src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -384,6 +384,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
         IPage<OrderManage> orderManagePage = this.page(pageParam, wrapper);
 
+
         if (ListUtil.isEmpty(orderManagePage.getRecords())) {
             return orderManagePage;
         }
@@ -409,8 +410,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
             if (ListUtil.isNotEmpty(list)) {
                 orderManage.setScheduleManage(list.stream().findAny().orElse(null));
             }
-            //兼容遗留数据
-            if (ListUtil.isEmpty(orderManage.getListOrderServer())) {
+            if (ListUtil.isNotEmpty(orderManage.getListOrderServer())) {
                 orderManage.getListOrderServer().forEach(orderServe -> {
                     if (orderServe.getEndTime() != null && orderServe.getStartTime() != null) {
                         orderServe.setActualServeDuration((int) (orderServe.getEndTime().getTime() -
@@ -422,6 +422,10 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                 });
             }
         });
+        orderManagePage.setRecords(orderManagePage.getRecords()
+                .stream()
+                .filter(var -> ListUtil.isNotEmpty(var.getListOrderServer()))
+                .collect(Collectors.toList()));
 
         return orderManagePage;
     }
@@ -603,9 +607,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                                 .eq(OrderManage::getPayUser, customerId)))
                 .orderByDesc(OrderManage::getCreateTime));
 
-//        List<Integer> orderUserIdList = orderManageList.stream().map(OrderManage::getOrderUser).collect(Collectors.toList());
-//        List<Integer> payUserIdList = orderManageList.stream().map(OrderManage::getPayUser).collect(Collectors.toList());
-
         //订单记录的图片
         for (OrderManage orderManage : orderManageList) {
             //订单详情
@@ -665,7 +666,25 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         if (!orderManage.getStatus().equals(OrderManage.STATUS_UN_COMMENT)) {
             throw new RRException("订单状态异常");
         }
+        List<OrderServe> orderServeList = orderServeMapper.selectList(new LambdaQueryWrapper<OrderServe>().eq(OrderServe::getOrderId, orderManage.getId()));
+
+
+        ScheduleManage scheduleManage = scheduleManageMapper.selectById(orderManage.getScheduledId());
+        List<ScheduleServe> scheduleServeList = scheduleServeMapper.selectList(new LambdaQueryWrapper<ScheduleServe>()
+                .eq(ScheduleServe::getSchId, scheduleManage.getId())
+                .eq(ScheduleServe::getMainServeId, null));
+
+        //主服务id
+        List<Integer> scheduledServeServeIds = scheduleServeList.stream().map(ScheduleServe::getServeId).collect(Collectors.toList());
+
+        //待评论的主服务ID
+        List<Integer> orderServeIds = orderServeList.stream()
+                .filter(orderServe -> scheduledServeServeIds.contains(orderServe.getServeId()))
+                .map(OrderServe::getId)
+                .collect(Collectors.toList());
 
+        //发表评论的服务id
+        List<Integer> commandOrderServeIds = cmd.getCommentList().stream().map(OrderCommentCommand::getOrderServeId).collect(Collectors.toList());
 
         //2、插入评论
         cmd.getCommentList()

src/main/java/com/gogirl/assembler/OrderManageDTOAssembler.java

@@ -27,12 +27,14 @@ public class OrderManageDTOAssembler implements Function<OrderManage, OrderManag
     public OrderManageDTO apply(OrderManage orderManage) {
         OrderManageDTO orderManageDTO = new OrderManageDTO();
         BeanUtils.copyProperties(orderManage, orderManageDTO);
-        orderManageDTO.setOrderServeDTOList(
-                orderManage.getListOrderServer()
-                        .stream()
-                        .map(orderServeDTOAssembler)
-                        .collect(Collectors.toList())
-        );
+        if (ListUtil.isNotEmpty(orderManage.getListOrderServer())) {
+            orderManageDTO.setOrderServeDTOList(
+                    orderManage.getListOrderServer()
+                            .stream()
+                            .map(orderServeDTOAssembler)
+                            .collect(Collectors.toList())
+            );
+        }
         if (orderManage.getScheduleManage() != null) {
             ScheduleManageDTO scheduleManageDTO = scheduleManageDTOAssembler.apply(orderManage.getScheduleManage());
             orderManageDTO.setScheduleManageDTO(scheduleManageDTO);

src/main/resources/mapper/product/BaseFeaturesMapper.xml

@@ -6,13 +6,12 @@
     <select id="queryServeFeatures" resultType="com.gogirl.domain.product.serve.BaseFeatures">
         select t1.* from base_features t1
         INNER JOIN features_mapping t2 on t1.id = t2.features_id
-        LEFT JOIN base_produce t3 on t2.data_id = t3.id
-        left join base_serve bs on t3.service_id = bs.id
+        left join base_serve bs on t2.data_id = bs.id
         where t2.data_type = 1
         <if test="serveTypeId != null">
             and bs.type_id=#{serveTypeId}
         </if>
-#         and t1.has_index_show = 1
+        # and t1.has_index_show = 1
         GROUP BY t1.id
         HAVING count(t1.id) > 0
         order by t1.index_sort asc