修改订单完整度算法

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

@@ -1152,12 +1152,42 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
         Customer customer = customerMapper.selectById(orderManage.getOrderUser());
 
-        if (orderRecordList.size() == orderServeList.size()) {
         dataRate = dataRate + dataRateMap.get(1);
-        }
 
-        if (ListUtil.isNotEmpty(orderRecordList.stream().map(orderRecord -> Lists.newArrayList(orderRecord.getPicturePath().split(","))).flatMap(List::stream).collect(Collectors.toList()))) {
+        for (OrderServe orderServe : orderServeList) {
+            OrderRecord orderRecord = orderRecordMapper.selectOne(new LambdaQueryWrapper<OrderRecord>()
+                    .eq(OrderRecord::getOrderId, orderId)
+                    .eq(OrderRecord::getOrderServeId, orderServe.getId()));
+
+            if (orderServe.getOrderRecordCondition() != null
+                    && (orderServe.getOrderRecordCondition() == 1 || orderServe.getOrderRecordCondition() == 2)
+                    && (orderServe.getServeTypeId() == 9 || orderServe.getServeTypeId() == 12)) {
+
+                List<OrderServeDescribeRelevance> orderServeDescribeRelevanceList = orderServeDescribeRelevanceMapper.selectList(new LambdaQueryWrapper<OrderServeDescribeRelevance>()
+                        .eq(OrderServeDescribeRelevance::getOrderServeId, orderServe.getId()));
+                if (ListUtil.isEmpty(orderServeDescribeRelevanceList)) {
+                    dataRate = dataRate - dataRateMap.get(1);
+                    break;
+                }
+                if (orderRecord == null) {
+                    dataRate = dataRate - dataRateMap.get(1);
+                    break;
+                }
+            }
+        }
         dataRate = dataRate + dataRateMap.get(2);
+
+        for (OrderServe orderServe : orderServeList) {
+            OrderRecord orderRecord = orderRecordMapper.selectOne(new LambdaQueryWrapper<OrderRecord>()
+                    .eq(OrderRecord::getOrderId, orderId)
+                    .eq(OrderRecord::getOrderServeId, orderServe.getId()));
+            if (orderServe.getOrderRecordCondition() != null
+                    && (orderServe.getOrderRecordCondition() == 1 || orderServe.getOrderRecordCondition() == 2)) {
+                if (orderRecord == null || StringUtils.isEmpty(orderRecord.getPicturePath())) {
+                    dataRate = dataRate - dataRateMap.get(2);
+                    break;
+                }
+            }
         }
 
         if (StringUtils.isNotEmpty(orderManage.getAfterSaleIsBuyCard())) {

src/main/java/com/gogirl/infrastructure/mapper/order/serve/OrderServeDescribeRelevanceMapper.java

 package com.gogirl.infrastructure.mapper.order.serve;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gogirl.domain.order.serve.OrderServe;
 import com.gogirl.domain.order.serve.OrderServeDescribeRelevance;
 
 import java.util.List;
 
 
-public interface OrderServeDescribeRelevanceMapper {
+public interface OrderServeDescribeRelevanceMapper extends BaseMapper<OrderServeDescribeRelevance> {
 
     /**
      * 删除所有订单服务描述