新增订单状态及服务类型状态

src/main/java/com/ydtech/config/SwaggerConfig.java

@@ -52,7 +52,7 @@ public class SwaggerConfig {
     @Bean(value = "invApi")
     @Order(value = 4)
     public Docket invApi() {
-        return buildDocket("inv","inv财务");
+        return buildDocket("inv", "inv财务");
     }
 
     @Bean(value = "reportApi")
@@ -95,15 +95,16 @@ public class SwaggerConfig {
     @Bean(value = "demoApi")
     @Order(value = 10)
     public Docket baseDemoApi() {
-        return buildDocket("demo","示例演示");
+        return buildDocket("demo", "示例演示");
     }
 
     @Bean(value = "largescreenApi")
     @Order(value = 11)
     public Docket largescreenApi() {
-        return buildDocket("largescreen","大屏接口");
+        return buildDocket("largescreen", "大屏接口");
     }
 
+
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
                 .title("晋掌柜 API 文档")
@@ -158,8 +159,7 @@ public class SwaggerConfig {
     }
 
 
-
-    public Docket buildDocket(String basePackage){
+    public Docket buildDocket(String basePackage) {
         return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo())
                 .select()
                 .apis(RequestHandlerSelectors.basePackage("com.ydtech.modules." + basePackage))
@@ -173,7 +173,8 @@ public class SwaggerConfig {
                 ;
 
     }
-    public Docket buildDocket(String basePackage,String groupName){
+
+    public Docket buildDocket(String basePackage, String groupName) {
         return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo())
                 .select()
                 .apis(RequestHandlerSelectors.basePackage("com.ydtech.modules." + basePackage))
@@ -189,6 +190,4 @@ public class SwaggerConfig {
     }
 
 
-
-
 }

src/main/java/com/ydtech/constants/enums/dict/ser/OderStateEnum.java

@@ -0,0 +1,47 @@
+package com.ydtech.constants.enums.dict.ser;
+
+
+import com.ydtech.aop.request.DictEnum;
+import com.ydtech.constants.enums.dict.IBaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+@DictEnum(key = "oderState", desc = "订单状态")
+public enum OderStateEnum implements IBaseEnum {
+
+    UNPAID("101","待支付",0,1),
+
+    AWAIT_RESCUE("102","待救援",0,1),
+
+    UNDERWAY_RESCUE("103","救援中",0,1),
+
+    FINISHED("104","已结束",0,1);
+
+    // 编号
+    private final String code;
+    //说明
+    private final String desc;
+    // 排序
+    private final Integer sort;
+    // 状态  0 启用  1 不启用
+    private final Integer status;
+
+    public static OderStateEnum getOderStateEnum(String code)
+    {
+        for (OderStateEnum item : OderStateEnum.values())
+        {
+            if (item.getCode().equals(code))
+            {
+                return item;
+            }
+        }
+        return null;
+    }
+
+
+
+
+
+}

src/main/java/com/ydtech/constants/enums/dict/ser/RescueTypeEnum.java

@@ -0,0 +1,39 @@
+package com.ydtech.constants.enums.dict.ser;
+
+
+import com.ydtech.aop.request.DictEnum;
+import com.ydtech.constants.enums.dict.IBaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+@DictEnum(key = "rescueType", desc = "救援类型")
+public enum RescueTypeEnum implements IBaseEnum {
+
+    ELECTRIC_RESCUE("201","搭电救援",0,1),
+
+    TRAILER_RESCUE("202","拖车救援",0,1),
+
+    TYRE_RESCUE("203","换胎救援",0,1);
+
+    // 编号
+    private final String code;
+    //说明
+    private final String desc;
+    // 排序
+    private final Integer sort;
+    // 状态  0 启用  1 不启用
+    private final Integer status;
+
+
+    public static RescueTypeEnum getRescueTypeEnum(String code) {
+        for (RescueTypeEnum rescueTypeEnum : RescueTypeEnum.values()) {
+            if (rescueTypeEnum.getCode().equals(code)) {
+                return rescueTypeEnum;
+            }
+        }
+        return null;
+    }
+
+}

src/main/java/com/ydtech/modules/ser/utils/PositionUtil.java

@@ -0,0 +1,48 @@
+package com.ydtech.modules.ser.utils;
+ 
+/**
+ * 计算距离
+ */
+public class PositionUtil {
+ 
+ 
+    /**
+     * 方法四：（高德地图计算方法）
+     *
+     * @param longitude1 第一点的经度
+     * @param latitude1  第一点的纬度
+     * @param longitude2 第二点的经度
+     * @param latitude2  第二点的纬度
+     * @return 返回的距离，单位m
+     */
+    public static Double getDistance4(double longitude1, double latitude1, double longitude2, double latitude2) {
+        if (longitude1 == 0 || latitude1 == 0 || latitude2 == 0 || longitude2 == 0) {
+            return -1.0;
+        }
+        longitude1 *= 0.01745329251994329;
+        latitude1 *= 0.01745329251994329;
+        longitude2 *= 0.01745329251994329;
+        latitude2 *= 0.01745329251994329;
+        double var1 = Math.sin(longitude1);
+        double var2 = Math.sin(latitude1);
+        double var3 = Math.cos(longitude1);
+        double var4 = Math.cos(latitude1);
+        double var5 = Math.sin(longitude2);
+        double var6 = Math.sin(latitude2);
+        double var7 = Math.cos(longitude2);
+        double var8 = Math.cos(latitude2);
+        double[] var10 = new double[3];
+        double[] var20 = new double[3];
+        var10[0] = var4 * var3;
+        var10[1] = var4 * var1;
+        var10[2] = var2;
+        var20[0] = var8 * var7;
+        var20[1] = var8 * var5;
+        var20[2] = var6;
+ 
+        return Math.asin(Math.sqrt((var10[0] - var20[0]) * (var10[0] - var20[0]) + (var10[1] - var20[1]) * (var10[1] - var20[1]) + (var10[2] - var20[2]) * (var10[2] - var20[2])) / 2.0) * 1.27420015798544E7;
+        // 结果四舍五入 保留2位小数
+        //return new BigDecimal(distance).setScale(2, RoundingMode.HALF_UP).doubleValue();
+    }
+ 
+}