调整04-02

lichao
1 parent b548022e
Showing 3 changed files with 85 additions and 8 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderAssociationServiceAsync.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchAskServiceImpl.java
trash-ui/src/views/gar/order/index.vue
@@ -102,7 +102,8 @@ public class GarOrderAssociationServiceAsync {
             List<double[]> coordinates = parseCoordinates(coord);
-            coordinates = com.trash.garbage.utils.DistanceUtil.expansion(coordinates, 200);
+            // 处置场所电子围栏外扩距离（单位：米）
+            coordinates = com.trash.garbage.utils.DistanceUtil.expansion(coordinates, 800);
             // 判断是否在多边形内
             boolean isInside = isPointInPolygon(vehicleLat, vehicleLon, coordinates);
             if (isInside) {
@@ -2,17 +2,25 @@ package com.trash.garbage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.trash.dropPointInfo.domain.DropPointInfo;
+import com.trash.dropPointInfo.service.IDropPointInfoService;
 import com.trash.garbage.mapper.GarOrderMapper;
 import com.trash.garbage.mapper.GarOrderMatchAskMapper;
 import com.trash.garbage.pojo.domain.DriverSend;
+import com.trash.garbage.pojo.domain.GarOrder;
 import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
 import com.trash.garbage.pojo.vo.OrderDetailTransportVo;
 import com.trash.garbage.service.GarOrderMatchAskService;
 import org.apache.ibatis.annotations.Param;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 /**
  * @author 20412
@@ -27,6 +35,8 @@ public class GarOrderMatchAskServiceImpl extends ServiceImpl&lt;GarOrderMatchAskMap
     GarOrderMatchAskMapper garOrderMatchAskMapper;
     @Autowired
     private GarOrderMapper garOrderMapper;
+    @Autowired
+    private IDropPointInfoService dropPointInfoService;
     @Override
@@ -42,12 +52,9 @@ public class GarOrderMatchAskServiceImpl extends ServiceImpl&lt;GarOrderMatchAskMap
      */
     @Override
     public GarOrderMatchAsk selectGarOrderMatchAskById(String garId)
-    {	
-    	
-    	
+    {
     	GarOrderMatchAsk ask = garOrderMatchAskMapper.selectGarOrderMatchAskById(garId);
-    	
-    	
+        fillDropPointInfoIfMissing(ask, null);
         return ask;
     }
@@ -60,7 +67,76 @@ public class GarOrderMatchAskServiceImpl extends ServiceImpl&lt;GarOrderMatchAskMap
     @Override
     public List<GarOrderMatchAsk> selectGarOrderMatchAskList(GarOrderMatchAsk garOrderMatchAsk)
     {
-        return garOrderMatchAskMapper.selectGarOrderMatchAskList(garOrderMatchAsk);
+        List<GarOrderMatchAsk> list = garOrderMatchAskMapper.selectGarOrderMatchAskList(garOrderMatchAsk);
+        if (CollectionUtils.isEmpty(list)) {
+            return list;
+        }
+        Map<String, DropPointInfo> dropPointCacheByPhone = new HashMap<>();
+        for (GarOrderMatchAsk ask : list) {
+            fillDropPointInfoIfMissing(ask, dropPointCacheByPhone);
+        }
+        return list;
+    }
+
+    private void fillDropPointInfoIfMissing(GarOrderMatchAsk ask, Map<String, DropPointInfo> dropPointCacheByPhone) {
+        if (Objects.isNull(ask)) {
+            return;
+        }
+        boolean missingDropPointInfo = ask.getDropPointId() <= 0
+                || StringUtils.isBlank(ask.getDropPointName())
+                || StringUtils.isBlank(ask.getDropPointNo());
+        if (!missingDropPointInfo || StringUtils.isBlank(ask.getGarOrderId())) {
+            return;
+        }
+        GarOrder order = garOrderMapper.selectById(ask.getGarOrderId());
+        if (Objects.isNull(order) || StringUtils.isBlank(order.getGarOrderContactTel())) {
+            return;
+        }
+        String orderAddress = StringUtils.defaultString(order.getGarOrderAddress()) + StringUtils.defaultString(order.getGarOrderAddressDetails());
+        if (StringUtils.isBlank(ask.getGarOrderPhone())) {
+            ask.setGarOrderPhone(order.getGarOrderContactTel());
+        }
+        if (StringUtils.isBlank(ask.getGarOrderName())) {
+            ask.setGarOrderName(order.getGarOrderContactName());
+        }
+        if (StringUtils.isBlank(ask.getDropAddress())) {
+            ask.setDropAddress(orderAddress);
+        }
+        DropPointInfo dropPointInfo;
+        if (Objects.nonNull(dropPointCacheByPhone) && dropPointCacheByPhone.containsKey(order.getGarOrderContactTel())) {
+            dropPointInfo = dropPointCacheByPhone.get(order.getGarOrderContactTel());
+        } else {
+            List<DropPointInfo> dropPointInfoList = dropPointInfoService.selectDropPointInfoListByPhone(order.getGarOrderContactTel());
+            dropPointInfo = CollectionUtils.isNotEmpty(dropPointInfoList) ? dropPointInfoList.get(0) : null;
+            if (Objects.nonNull(dropPointCacheByPhone)) {
+                dropPointCacheByPhone.put(order.getGarOrderContactTel(), dropPointInfo);
+            }
+        }
+        if (Objects.isNull(dropPointInfo)) {
+            // 查不到投放点时，兜底展示下单信息
+            if (StringUtils.isBlank(ask.getDropPointName())) {
+                ask.setDropPointName(orderAddress);
+            }
+            if (StringUtils.isBlank(ask.getDropPointNo())) {
+                ask.setDropPointNo(order.getGarOrderId());
+            }
+            if (StringUtils.isBlank(ask.getDropCustodianPhone())) {
+                ask.setDropCustodianPhone(order.getGarOrderContactTel());
+            }
+            return;
+        }
+        if (ask.getDropPointId() <= 0 && Objects.nonNull(dropPointInfo.getId())) {
+            ask.setDropPointId(dropPointInfo.getId().intValue());
+        }
+        if (StringUtils.isBlank(ask.getDropPointName())) {
+            ask.setDropPointName(dropPointInfo.getDropPointName());
+        }
+        if (StringUtils.isBlank(ask.getDropPointNo())) {
+            ask.setDropPointNo(dropPointInfo.getDropPointNo());
+        }
+        if (StringUtils.isBlank(ask.getDropCustodianPhone())) {
+            ask.setDropCustodianPhone(dropPointInfo.getCustodianPhone());
+        }
     }
     /**
@@ -52,7 +52,7 @@
       <el-table-column label="备注" align="center" prop="garRemark" />
       <el-table-column label="是否取消" align="center" prop="garCancelFlag">
         <template slot-scope="scope">
-          {{ computedCancelFlagString(scope.row.garCancelFlag).toString() }}2
+          {{ computedCancelFlagString(scope.row.garCancelFlag).toString() }}
         </template>
       </el-table-column>
       <el-table-column label="车辆数量" align="center" prop="garRealCarCount" />