Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop

project-dispatch/src/main/java/com/dituhui/pea/dispatch/utils/RoadDistanceUtils.java

@@ -13,6 +13,7 @@ import java.util.Map;
 
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
 import com.dituhui.pea.dispatch.common.redis.RedisUtil;
 import com.dituhui.pea.dispatch.common.redis.RedisUtil;
+import com.dituhui.pea.enums.RedisKeyGroup;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 import com.dituhui.pea.dispatch.pojo.Location;
 import com.dituhui.pea.dispatch.pojo.Location;
@@ -64,7 +65,7 @@ public class RoadDistanceUtils {
                     return dis;
                     return dis;
                 } else {
                 } else {
                     //distanceCache.put(key, distance);
                     //distanceCache.put(key, distance);
-                    RedisUtil.set(key, distance);
+                    RedisUtil.set(key, distance, 3600 * 24 * 7);
                 }
                 }
                 return distance;
                 return distance;
             } else {
             } else {
@@ -100,7 +101,7 @@ public class RoadDistanceUtils {
                     return dis;
                     return dis;
                 } else {
                 } else {
                     //distanceCache.put(key, distance);
                     //distanceCache.put(key, distance);
-                    RedisUtil.set(key, distance);
+                    RedisUtil.set(key, distance, 3600 * 24 * 7);
                 }
                 }
                 return distance;
                 return distance;
             } else {
             } else {
@@ -113,7 +114,7 @@ public class RoadDistanceUtils {
     }
     }
 
 
     public static String getLocationKey(Location from, Location to, int vehicleType) {
     public static String getLocationKey(Location from, Location to, int vehicleType) {
-        return convertDoubleToStr(from.getLongitude()) + ","
+        return RedisKeyGroup.locationDistanceKey + ":" + convertDoubleToStr(from.getLongitude()) + ","
                 + convertDoubleToStr(from.getLatitude()) + ";"
                 + convertDoubleToStr(from.getLatitude()) + ";"
                 + convertDoubleToStr(to.getLongitude()) + ","
                 + convertDoubleToStr(to.getLongitude()) + ","
                 + convertDoubleToStr(to.getLatitude()) + "|" + vehicleType;
                 + convertDoubleToStr(to.getLatitude()) + "|" + vehicleType;

project-interface/src/main/java/com/dituhui/pea/enums/RedisKeyGroup.java

@@ -18,6 +18,11 @@ public enum RedisKeyGroup {
     /**
     /**
      * 资源信息
      * 资源信息
      */
      */
-    resourceKey;
+    resourceKey,
+
+    /**
+     * 坐标距离信息
+     */
+    locationDistanceKey;
 
 
 }
 }

project-order/src/main/java/com/dituhui/pea/order/controller/OrderCreateController.java

@@ -6,6 +6,7 @@ import com.dituhui.pea.order.dto.param.CapacityQueryDTO;
 import com.dituhui.pea.order.dto.param.OrderDTO;
 import com.dituhui.pea.order.dto.param.OrderDTO;
 import com.dituhui.pea.order.service.CapacityQueryService;
 import com.dituhui.pea.order.service.CapacityQueryService;
 import com.dituhui.pea.order.service.OrderCreateService;
 import com.dituhui.pea.order.service.OrderCreateService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,6 +23,7 @@ import java.time.ZoneId;
  */
  */
 @RestController
 @RestController
 @RequestMapping("/pea-order")
 @RequestMapping("/pea-order")
+@Slf4j
 public class OrderCreateController {
 public class OrderCreateController {
 
 
     @Autowired
     @Autowired
@@ -36,6 +38,7 @@ public class OrderCreateController {
         try {
         try {
             res = orderCreateService.createOrder(orderCreateReqDTO);
             res = orderCreateService.createOrder(orderCreateReqDTO);
         } catch (BusinessException e) {
         } catch (BusinessException e) {
+            log.error("创建订单失败：" + e.getMessage(), e);
             return Result.failed(e.getMessage());
             return Result.failed(e.getMessage());
         }
         }
         return res;
         return res;