忽略文件

business-common/business-common-core/src/main/java/com/sckw/core/config/FilterConfig.java

@@ -1,25 +1,25 @@
-//package com.sckw.core.config;
-//
-//import com.sckw.core.filter.TenantFilter;
-//import org.springframework.boot.web.servlet.FilterRegistrationBean;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//
-///**
-// * @desc:
-// * @author: Lt
-// * @date: 2024-05-22
-// */
-//@Configuration
-//public class FilterConfig {
-//    @Bean
-//    public FilterRegistrationBean<TenantFilter> tenantFilter() {
-//        FilterRegistrationBean<TenantFilter> registrationBean = new FilterRegistrationBean<>();
-//        registrationBean.setFilter(new TenantFilter());
-//        // 如果您有多个过滤器，可以设置顺序
-//        //registrationBean.setOrder(1);
-//        // 定义此过滤器适用的 URL 模式
-//        registrationBean.addUrlPatterns("/*");
-//        return registrationBean;
-//    }
-//}
+//package com.sckw.core.config;
+//
+//import com.sckw.core.filter.TenantFilter;
+//import org.springframework.boot.web.servlet.FilterRegistrationBean;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+///**
+// * @desc:
+// * @author: Lt
+// * @date: 2024-05-22
+// */
+//@Configuration
+//public class FilterConfig {
+//    @Bean
+//    public FilterRegistrationBean<TenantFilter> tenantFilter() {
+//        FilterRegistrationBean<TenantFilter> registrationBean = new FilterRegistrationBean<>();
+//        registrationBean.setFilter(new TenantFilter());
+//        // 如果您有多个过滤器，可以设置顺序
+//        //registrationBean.setOrder(1);
+//        // 定义此过滤器适用的 URL 模式
+//        registrationBean.addUrlPatterns("/*");
+//        return registrationBean;
+//    }
+//}

business-common/business-common-core/src/main/java/com/sckw/core/filter/TenantFilter.java

@@ -1,31 +1,31 @@
-package com.sckw.core.filter;
-
-import cn.hutool.core.util.StrUtil;
-import com.sckw.core.utils.TenantUtil;
-import com.sckw.core.utils.WebFrameworkUtils;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.stereotype.Component;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import java.io.IOException;
-
-/**
- * @author xucaiqin
- * @date 2024-05-21 09:12:35
- */
-@Component
-public class TenantFilter extends OncePerRequestFilter {
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
-        String tenantId = WebFrameworkUtils.getTenantId(request);
-        TenantUtil.setTenant(StrUtil.isBlank(tenantId) || tenantId.equals("null") ? "1" : tenantId);
-        try {
-            filterChain.doFilter(request, response);
-        } finally {
-            TenantUtil.clear();
-        }
-    }
-}
+package com.sckw.core.filter;
+
+import cn.hutool.core.util.StrUtil;
+import com.sckw.core.utils.TenantUtil;
+import com.sckw.core.utils.WebFrameworkUtils;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import java.io.IOException;
+
+/**
+ * @author xucaiqin
+ * @date 2024-05-21 09:12:35
+ */
+@Component
+public class TenantFilter extends OncePerRequestFilter {
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+        String tenantId = WebFrameworkUtils.getTenantId(request);
+        TenantUtil.setTenant(StrUtil.isBlank(tenantId) || tenantId.equals("null") ? "1" : tenantId);
+        try {
+            filterChain.doFilter(request, response);
+        } finally {
+            TenantUtil.clear();
+        }
+    }
+}

business-common/business-common-core/src/main/java/com/sckw/core/model/enums/OrderCarStatusEnum.java

@@ -1,45 +1,45 @@
-package com.sckw.core.model.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-@AllArgsConstructor
-@Getter
-public enum OrderCarStatusEnum {
-    HAVE_BEEN_SAVED(1, "已保存"),
-    UNDER_REVIEW(3, "审核中"),
-    WAIT_TRANSPORT(5, "待运输"),
-    IN_TRANSIT(7, "运输中"),
-    FINISHED(9, "已完成"),
-    RECONCILED(11, "待对账"),
-    WAIT_SETTLED(13, "待结算"),
-    FINISH_SETTLED(15, "已结算"),
-    CANCELLED(17, "已取消"),
-    RETURNED(19, "已退回")
-            ;
-
-    private final Integer code;
-    private final String msg;
-
-
-    public static String getNameByCode(Integer code) {
-        OrderCarStatusEnum[] enums = OrderCarStatusEnum.values();
-        for (OrderCarStatusEnum instance : enums) {
-            if (Objects.equals(instance.getCode(), code)) {
-                return instance.getMsg();
-            }
-        }
-        return null;
-    }
-
-    public static List<OrderCarStatusEnum> getSortList() {
-        OrderCarStatusEnum[] enums = OrderCarStatusEnum.values();
-        return Arrays.stream(enums).sorted(Comparator.comparingInt(OrderCarStatusEnum::getCode)).collect(Collectors.toList());
-    }
-}
+package com.sckw.core.model.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@AllArgsConstructor
+@Getter
+public enum OrderCarStatusEnum {
+    HAVE_BEEN_SAVED(1, "已保存"),
+    UNDER_REVIEW(3, "审核中"),
+    WAIT_TRANSPORT(5, "待运输"),
+    IN_TRANSIT(7, "运输中"),
+    FINISHED(9, "已完成"),
+    RECONCILED(11, "待对账"),
+    WAIT_SETTLED(13, "待结算"),
+    FINISH_SETTLED(15, "已结算"),
+    CANCELLED(17, "已取消"),
+    RETURNED(19, "已退回")
+            ;
+
+    private final Integer code;
+    private final String msg;
+
+
+    public static String getNameByCode(Integer code) {
+        OrderCarStatusEnum[] enums = OrderCarStatusEnum.values();
+        for (OrderCarStatusEnum instance : enums) {
+            if (Objects.equals(instance.getCode(), code)) {
+                return instance.getMsg();
+            }
+        }
+        return null;
+    }
+
+    public static List<OrderCarStatusEnum> getSortList() {
+        OrderCarStatusEnum[] enums = OrderCarStatusEnum.values();
+        return Arrays.stream(enums).sorted(Comparator.comparingInt(OrderCarStatusEnum::getCode)).collect(Collectors.toList());
+    }
+}

business-common/business-common-core/src/main/java/com/sckw/core/model/enums/OrderSourceEnum.java

@@ -1,38 +1,38 @@
-package com.sckw.core.model.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-@AllArgsConstructor
-@Getter
-public enum OrderSourceEnum {
-    SELF_BUILD_NORMAL_LAND_ORDER(1, "物流自建-普货-陆运"),
-    SELF_BUILD_CAR_LAND_ORDER(2, "物流自建-轿运-陆运"),
-    PRODUCTION_TRANSPORTATION(3, "生产运输"),
-    LOGISTICS_CONSIGN(4, "物流托运");
-
-    private final Integer code;
-    private final String msg;
-
-
-    public static String getNameByCode(Integer code) {
-        OrderSourceEnum[] enums = OrderSourceEnum.values();
-        for (OrderSourceEnum instance : enums) {
-            if (Objects.equals(instance.getCode(), code)) {
-                return instance.getMsg();
-            }
-        }
-        return null;
-    }
-
-    public static List<OrderSourceEnum> getSortList() {
-        OrderSourceEnum[] enums = OrderSourceEnum.values();
-        return Arrays.stream(enums).sorted(Comparator.comparingInt(OrderSourceEnum::getCode)).collect(Collectors.toList());
-    }
-}
+package com.sckw.core.model.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@AllArgsConstructor
+@Getter
+public enum OrderSourceEnum {
+    SELF_BUILD_NORMAL_LAND_ORDER(1, "物流自建-普货-陆运"),
+    SELF_BUILD_CAR_LAND_ORDER(2, "物流自建-轿运-陆运"),
+    PRODUCTION_TRANSPORTATION(3, "生产运输"),
+    LOGISTICS_CONSIGN(4, "物流托运");
+
+    private final Integer code;
+    private final String msg;
+
+
+    public static String getNameByCode(Integer code) {
+        OrderSourceEnum[] enums = OrderSourceEnum.values();
+        for (OrderSourceEnum instance : enums) {
+            if (Objects.equals(instance.getCode(), code)) {
+                return instance.getMsg();
+            }
+        }
+        return null;
+    }
+
+    public static List<OrderSourceEnum> getSortList() {
+        OrderSourceEnum[] enums = OrderSourceEnum.values();
+        return Arrays.stream(enums).sorted(Comparator.comparingInt(OrderSourceEnum::getCode)).collect(Collectors.toList());
+    }
+}

business-common/business-common-core/src/main/java/com/sckw/core/model/enums/OrderUsualStatusEnum.java

@@ -1,45 +1,45 @@
-package com.sckw.core.model.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-@AllArgsConstructor
-@Getter
-public enum OrderUsualStatusEnum {
-    HAVE_BEEN_SAVED(1, "已保存"),
-    UNDER_REVIEW(3, "审核中"),
-    WAIT_TRANSPORT(5, "待运输"),
-    IN_TRANSIT(7, "运输中"),
-    FINISHED(9, "已完成"),
-    RECONCILED(11, "待对账"),
-    WAIT_SETTLED(13, "待结算"),
-    FINISH_SETTLED(15, "已结算"),
-    CANCELLED(17, "已取消"),
-    RETURNED(19, "已退回")
-            ;
-
-    private final Integer code;
-    private final String msg;
-
-
-    public static String getNameByCode(Integer code) {
-        OrderUsualStatusEnum[] enums = OrderUsualStatusEnum.values();
-        for (OrderUsualStatusEnum instance : enums) {
-            if (Objects.equals(instance.getCode(), code)) {
-                return instance.getMsg();
-            }
-        }
-        return null;
-    }
-
-    public static List<OrderUsualStatusEnum> getSortList() {
-        OrderUsualStatusEnum[] enums = OrderUsualStatusEnum.values();
-        return Arrays.stream(enums).sorted(Comparator.comparingInt(OrderUsualStatusEnum::getCode)).collect(Collectors.toList());
-    }
-}
+package com.sckw.core.model.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@AllArgsConstructor
+@Getter
+public enum OrderUsualStatusEnum {
+    HAVE_BEEN_SAVED(1, "已保存"),
+    UNDER_REVIEW(3, "审核中"),
+    WAIT_TRANSPORT(5, "待运输"),
+    IN_TRANSIT(7, "运输中"),
+    FINISHED(9, "已完成"),
+    RECONCILED(11, "待对账"),
+    WAIT_SETTLED(13, "待结算"),
+    FINISH_SETTLED(15, "已结算"),
+    CANCELLED(17, "已取消"),
+    RETURNED(19, "已退回")
+            ;
+
+    private final Integer code;
+    private final String msg;
+
+
+    public static String getNameByCode(Integer code) {
+        OrderUsualStatusEnum[] enums = OrderUsualStatusEnum.values();
+        for (OrderUsualStatusEnum instance : enums) {
+            if (Objects.equals(instance.getCode(), code)) {
+                return instance.getMsg();
+            }
+        }
+        return null;
+    }
+
+    public static List<OrderUsualStatusEnum> getSortList() {
+        OrderUsualStatusEnum[] enums = OrderUsualStatusEnum.values();
+        return Arrays.stream(enums).sorted(Comparator.comparingInt(OrderUsualStatusEnum::getCode)).collect(Collectors.toList());
+    }
+}

business-common/business-common-core/src/main/java/com/sckw/core/utils/AESUtil.java

@@ -1,72 +1,72 @@
-package com.sckw.core.utils;
-
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-import java.security.SecureRandom;
-import java.util.Base64;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-05-22
- */
-public class AESUtil {
-    private static final String ALGORITHM = "AES/CBC/PKCS5Padding";
-    private static final int KEY_SIZE = 128;
-
-    /**
-    * @Description:
-    * @Author: Lt
-    * @Date: 2024/5/22 15:13
-    */
-    public static String encrypt(String data, String salt) throws Exception
-    {
-        Cipher cipher = Cipher.getInstance(ALGORITHM);
-        SecretKeySpec secretKey = new SecretKeySpec(salt.getBytes(), "AES");
-        cipher.init(Cipher.ENCRYPT_MODE, secretKey, new IvParameterSpec(new byte[16]));
-        byte[] encryptedBytes = cipher.doFinal(data.getBytes());
-        return Base64.getEncoder().encodeToString(encryptedBytes);
-    }
-
-
-    /**
-    * @Description: AES解码
-    * @Author: Lt
-    * @Date: 2024/5/22 15:14
-    */
-    public static String decrypt(String encryptedData, String salt) throws Exception
-    {
-        Cipher cipher = Cipher.getInstance(ALGORITHM);
-        SecretKeySpec secretKey = new SecretKeySpec(salt.getBytes(), "AES");
-        cipher.init(Cipher.DECRYPT_MODE, secretKey, new IvParameterSpec(new byte[16]));
-        byte[] decryptedBytes = cipher.doFinal(Base64.getDecoder().decode(encryptedData));
-        return new String(decryptedBytes);
-    }
-
-    /**
-     * 生成一个指定长度的随机盐值。
-     *
-     * @param length 盐值的长度。
-     * @return 生成的盐值。
-     */
-    public static String generateSalt(int length) {
-        if (length <= 0) {
-            throw new IllegalArgumentException("Length must be a positive number");
-        }
-
-        // 创建一个SecureRandom对象
-        SecureRandom random = new SecureRandom();
-        // 生成一个随机的字节数组
-        byte[] bytes = new byte[length];
-        random.nextBytes(bytes);
-
-        // 将字节数组编码为Base64字符串，以缩短长度并保证字符串只包含可打印字符
-        return Base64.getEncoder().encodeToString(bytes);
-    }
-
-}
-
+package com.sckw.core.utils;
+
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.SecureRandom;
+import java.util.Base64;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-22
+ */
+public class AESUtil {
+    private static final String ALGORITHM = "AES/CBC/PKCS5Padding";
+    private static final int KEY_SIZE = 128;
+
+    /**
+    * @Description:
+    * @Author: Lt
+    * @Date: 2024/5/22 15:13
+    */
+    public static String encrypt(String data, String salt) throws Exception
+    {
+        Cipher cipher = Cipher.getInstance(ALGORITHM);
+        SecretKeySpec secretKey = new SecretKeySpec(salt.getBytes(), "AES");
+        cipher.init(Cipher.ENCRYPT_MODE, secretKey, new IvParameterSpec(new byte[16]));
+        byte[] encryptedBytes = cipher.doFinal(data.getBytes());
+        return Base64.getEncoder().encodeToString(encryptedBytes);
+    }
+
+
+    /**
+    * @Description: AES解码
+    * @Author: Lt
+    * @Date: 2024/5/22 15:14
+    */
+    public static String decrypt(String encryptedData, String salt) throws Exception
+    {
+        Cipher cipher = Cipher.getInstance(ALGORITHM);
+        SecretKeySpec secretKey = new SecretKeySpec(salt.getBytes(), "AES");
+        cipher.init(Cipher.DECRYPT_MODE, secretKey, new IvParameterSpec(new byte[16]));
+        byte[] decryptedBytes = cipher.doFinal(Base64.getDecoder().decode(encryptedData));
+        return new String(decryptedBytes);
+    }
+
+    /**
+     * 生成一个指定长度的随机盐值。
+     *
+     * @param length 盐值的长度。
+     * @return 生成的盐值。
+     */
+    public static String generateSalt(int length) {
+        if (length <= 0) {
+            throw new IllegalArgumentException("Length must be a positive number");
+        }
+
+        // 创建一个SecureRandom对象
+        SecureRandom random = new SecureRandom();
+        // 生成一个随机的字节数组
+        byte[] bytes = new byte[length];
+        random.nextBytes(bytes);
+
+        // 将字节数组编码为Base64字符串，以缩短长度并保证字符串只包含可打印字符
+        return Base64.getEncoder().encodeToString(bytes);
+    }
+
+}
+

business-common/business-common-core/src/main/java/com/sckw/core/utils/TenantUtil.java

@@ -1,23 +1,23 @@
-package com.sckw.core.utils;
-
-/**
- * @author xucaiqin
- * @date 2024-05-20 17:15:04
- */
-public class TenantUtil {
-    private final static ThreadLocal<String> tenant = new ThreadLocal<>();
-
-    private TenantUtil() {
-    }
-
-    public static void setTenant(String tenantId) {
-        tenant.set(tenantId);
-    }
-
-    public static String getTenant() {
-        return tenant.get();
-    }
-    public static void clear() {
-         tenant.remove();
-    }
-}
+package com.sckw.core.utils;
+
+/**
+ * @author xucaiqin
+ * @date 2024-05-20 17:15:04
+ */
+public class TenantUtil {
+    private final static ThreadLocal<String> tenant = new ThreadLocal<>();
+
+    private TenantUtil() {
+    }
+
+    public static void setTenant(String tenantId) {
+        tenant.set(tenantId);
+    }
+
+    public static String getTenant() {
+        return tenant.get();
+    }
+    public static void clear() {
+         tenant.remove();
+    }
+}

business-common/business-common-core/src/main/java/com/sckw/core/utils/WebFrameworkUtils.java

@@ -1,32 +1,32 @@
-package com.sckw.core.utils;
-
-import jakarta.servlet.http.HttpServletRequest;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-/**
- * 专属于 web 包的工具类
- *
- * @author 芋道源码
- */
-public class WebFrameworkUtils {
-
-    public static final String HEADER_TENANT_ID = "tenant-id";
-
-
-    public static String getTenantId(HttpServletRequest request) {
-        return request.getHeader(HEADER_TENANT_ID);
-    }
-
-
-    public static HttpServletRequest getRequest() {
-        RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
-        if (!(requestAttributes instanceof ServletRequestAttributes)) {
-            return null;
-        }
-        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) requestAttributes;
-        return servletRequestAttributes.getRequest();
-    }
-
-}
+package com.sckw.core.utils;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+/**
+ * 专属于 web 包的工具类
+ *
+ * @author 芋道源码
+ */
+public class WebFrameworkUtils {
+
+    public static final String HEADER_TENANT_ID = "tenant-id";
+
+
+    public static String getTenantId(HttpServletRequest request) {
+        return request.getHeader(HEADER_TENANT_ID);
+    }
+
+
+    public static HttpServletRequest getRequest() {
+        RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+        if (!(requestAttributes instanceof ServletRequestAttributes)) {
+            return null;
+        }
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) requestAttributes;
+        return servletRequestAttributes.getRequest();
+    }
+
+}

business-common/business-common-core/src/main/java/com/sckw/core/web/response/HttpResult.java

@@ -1,88 +1,88 @@
-package com.sckw.core.web.response;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @desc:
- * @author: lt
- * @date: 2024/3/23 13:47
- */
-@Data
-public class HttpResult implements Serializable {
-
-    private int code =200;
-    private String msg = "success";
-    private Object data;
-
-    public static HttpResult error() {
-        return error(500, "error");
-    }
-
-    public static HttpResult error(String msg) {
-        return error(500, msg);
-    }
-
-    public static HttpResult error(int code, String msg) {
-        HttpResult r = new HttpResult();
-        r.setCode(code);
-        r.setMsg(msg);
-        return r;
-    }
-
-    public static HttpResult error(String msg, Object data) {
-        HttpResult r = new HttpResult();
-        r.setCode(500);
-        r.setMsg(msg);
-        r.setData(data);
-        return r;
-    }
-
-    public static HttpResult error(int code, String msg, Object data) {
-        HttpResult r = new HttpResult();
-        r.setCode(code);
-        r.setMsg(msg);
-        r.setData(data);
-        return r;
-    }
-
-
-    public static HttpResult ok() {
-        return new HttpResult();
-    }
-
-    public static HttpResult ok(String msg) {
-        HttpResult r = new HttpResult();
-        r.setMsg(msg);
-        return r;
-    }
-
-    public static HttpResult ok(Object data) {
-        HttpResult r = new HttpResult();
-        r.setData(data);
-        return r;
-    }
-
-    public static HttpResult ok(int code, String msg) {
-        HttpResult r = new HttpResult();
-        r.setCode(code);
-        r.setMsg(msg);
-        return r;
-    }
-
-    public static HttpResult ok(String msg, Object data) {
-        HttpResult r = new HttpResult();
-        r.setMsg(msg);
-        r.setData(data);
-        return r;
-    }
-
-    public static HttpResult ok(int code,String msg, Object data) {
-        HttpResult r = new HttpResult();
-        r.setCode(code);
-        r.setMsg(msg);
-        r.setData(data);
-        return r;
-    }
-}
+package com.sckw.core.web.response;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @desc:
+ * @author: lt
+ * @date: 2024/3/23 13:47
+ */
+@Data
+public class HttpResult implements Serializable {
+
+    private int code =200;
+    private String msg = "success";
+    private Object data;
+
+    public static HttpResult error() {
+        return error(500, "error");
+    }
+
+    public static HttpResult error(String msg) {
+        return error(500, msg);
+    }
+
+    public static HttpResult error(int code, String msg) {
+        HttpResult r = new HttpResult();
+        r.setCode(code);
+        r.setMsg(msg);
+        return r;
+    }
+
+    public static HttpResult error(String msg, Object data) {
+        HttpResult r = new HttpResult();
+        r.setCode(500);
+        r.setMsg(msg);
+        r.setData(data);
+        return r;
+    }
+
+    public static HttpResult error(int code, String msg, Object data) {
+        HttpResult r = new HttpResult();
+        r.setCode(code);
+        r.setMsg(msg);
+        r.setData(data);
+        return r;
+    }
+
+
+    public static HttpResult ok() {
+        return new HttpResult();
+    }
+
+    public static HttpResult ok(String msg) {
+        HttpResult r = new HttpResult();
+        r.setMsg(msg);
+        return r;
+    }
+
+    public static HttpResult ok(Object data) {
+        HttpResult r = new HttpResult();
+        r.setData(data);
+        return r;
+    }
+
+    public static HttpResult ok(int code, String msg) {
+        HttpResult r = new HttpResult();
+        r.setCode(code);
+        r.setMsg(msg);
+        return r;
+    }
+
+    public static HttpResult ok(String msg, Object data) {
+        HttpResult r = new HttpResult();
+        r.setMsg(msg);
+        r.setData(data);
+        return r;
+    }
+
+    public static HttpResult ok(int code,String msg, Object data) {
+        HttpResult r = new HttpResult();
+        r.setCode(code);
+        r.setMsg(msg);
+        r.setData(data);
+        return r;
+    }
+}

business-common/business-common-redis/src/main/java/com/sckw/redis/utils/GenOrderCode.java

@@ -1,85 +1,85 @@
-package com.sckw.redis.utils;
-
-import org.redisson.api.RAtomicLong;
-import org.redisson.api.RLock;
-import org.redisson.api.RedissonClient;
-import org.springframework.stereotype.Component;
-
-import java.util.Random;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-05-27
- */
-@Component
-public class GenOrderCode {
-    // 创建Redisson客户端实例
-    private final RedissonClient redissonClient;
-
-    public GenOrderCode(RedissonClient redissonClient) {
-        this.redissonClient = redissonClient;
-    }
-
-    /**
-     * 生成指定长度的订单号
-     *
-     * @param length   订单总长度
-     * @param prefix   前缀 当天日期-yyMMdd
-     * @param lockKey 分布式锁id
-     * @return 订单号
-     */
-    public String genOrderCode(int length, String prefix, String lockKey) {
-        // 检查参数合法性
-        if (length <= 0) {
-            throw new RuntimeException("订单总长度或随机码长度不能小于0");
-        }
-        if (length <= prefix.length()) {
-            throw new RuntimeException("订单总长度长度小于前缀长度");
-        }
-
-        // 获取分布式锁
-        RLock lock = redissonClient.getLock(lockKey);
-        lock.lock();
-        try {
-            // 从Redis中获取递增的序列号
-            RAtomicLong counter = redissonClient.getAtomicLong("counter");
-            // 递增计数器
-            long incrementedValue = counter.incrementAndGet();
-            String counterValue = String.valueOf(incrementedValue);
-            int incrLength = counterValue.length();
-
-            // 如果前缀长度加数字自增长度大于指定位数，则直接使用自增数据
-            if (incrLength + prefix.length() > length) {
-                return prefix + counterValue;
-            }
-
-            // 生成随机码
-            int randomLength = length - incrLength;
-            String randomAlphabetic = generateRandomAlphabeticString(randomLength);
-            // 格式化订单号
-            return prefix + randomAlphabetic + counterValue;
-        } finally {
-            // 释放锁
-            lock.unlock();
-        }
-    }
-
-
-    public static String generateRandomAlphabeticString(int length) {
-        if (length < 0) {
-            throw new IllegalArgumentException("Length cannot be negative.");
-        }
-
-        StringBuilder sb = new StringBuilder(length);
-        Random random = new Random();
-        String alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
-        for (int i = 0; i < length; i++) {
-            int index = random.nextInt(alphabet.length());
-            sb.append(alphabet.charAt(index));
-        }
-
-        return sb.toString();
-    }
-}
+package com.sckw.redis.utils;
+
+import org.redisson.api.RAtomicLong;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Component;
+
+import java.util.Random;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-27
+ */
+@Component
+public class GenOrderCode {
+    // 创建Redisson客户端实例
+    private final RedissonClient redissonClient;
+
+    public GenOrderCode(RedissonClient redissonClient) {
+        this.redissonClient = redissonClient;
+    }
+
+    /**
+     * 生成指定长度的订单号
+     *
+     * @param length   订单总长度
+     * @param prefix   前缀 当天日期-yyMMdd
+     * @param lockKey 分布式锁id
+     * @return 订单号
+     */
+    public String genOrderCode(int length, String prefix, String lockKey) {
+        // 检查参数合法性
+        if (length <= 0) {
+            throw new RuntimeException("订单总长度或随机码长度不能小于0");
+        }
+        if (length <= prefix.length()) {
+            throw new RuntimeException("订单总长度长度小于前缀长度");
+        }
+
+        // 获取分布式锁
+        RLock lock = redissonClient.getLock(lockKey);
+        lock.lock();
+        try {
+            // 从Redis中获取递增的序列号
+            RAtomicLong counter = redissonClient.getAtomicLong("counter");
+            // 递增计数器
+            long incrementedValue = counter.incrementAndGet();
+            String counterValue = String.valueOf(incrementedValue);
+            int incrLength = counterValue.length();
+
+            // 如果前缀长度加数字自增长度大于指定位数，则直接使用自增数据
+            if (incrLength + prefix.length() > length) {
+                return prefix + counterValue;
+            }
+
+            // 生成随机码
+            int randomLength = length - incrLength;
+            String randomAlphabetic = generateRandomAlphabeticString(randomLength);
+            // 格式化订单号
+            return prefix + randomAlphabetic + counterValue;
+        } finally {
+            // 释放锁
+            lock.unlock();
+        }
+    }
+
+
+    public static String generateRandomAlphabeticString(int length) {
+        if (length < 0) {
+            throw new IllegalArgumentException("Length cannot be negative.");
+        }
+
+        StringBuilder sb = new StringBuilder(length);
+        Random random = new Random();
+        String alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+        for (int i = 0; i < length; i++) {
+            int index = random.nextInt(alphabet.length());
+            sb.append(alphabet.charAt(index));
+        }
+
+        return sb.toString();
+    }
+}

business-common/business-common-redis/src/main/java/com/sckw/redis/utils/GenerateOrderIdUtil.java

@@ -1,77 +1,77 @@
-package com.sckw.redis.utils;
-
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.support.atomic.RedisAtomicLong;
-import org.springframework.stereotype.Component;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * 生成订单流水号18  * 精确到秒级，后面加随机数（redis获取）
- * <p>
- * 通过增加随机性，修正因宿主机时钟回拨导致生成重复值的bug
- * key改为按日期，最后的拼接用取模的方式防止数据越界，②解决concat带来的bug。
- *
- * @author wangzaizhou
- **/
-@Component
-@Slf4j
-public class GenerateOrderIdUtil {
-    //private static Logger logger = LoggerFactory.getLogger(SequenceService.class);
-
-    @Resource
-    private RedisTemplate redisTemplate;
-
-    //用作存放redis中的key
-    private static String ORDER_KEY = "order_key";
-
-    //生成特定的业务编号，prefix为特定的业务代码
-    public String getOrderNo(String prefix){
-        return getSeqNo(ORDER_KEY, prefix);
-    }
-
-    //SequenceService类中公用部分，传入制定的key和prefix
-    private String getSeqNo(String key, String prefix)
-    {
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY, 23);
-        calendar.set(Calendar.MINUTE, 59);
-        calendar.set(Calendar.SECOND, 59);
-        calendar.set(Calendar.MILLISECOND, 999);
-        //设置过期时间，这里设置为当天的23:59:59
-        Date expireDate = calendar.getTime();
-        //返回当前redis中的key的最大值
-        Long seq = generate(redisTemplate, key, expireDate);
-        //获取当天的日期，格式为yyyyMMdd
-        String date = new SimpleDateFormat("yyyyMMdd").format(expireDate);
-        //生成八为的序列号，如果seq不够八位，seq前面补0，
-        //如果seq位数超过了八位，那么无需补0直接返回当前的seq
-        String sequence = String.format("%08d", Integer.parseInt(seq.toString()));
-        if (prefix == null)
-        {
-            prefix = "";
-        }
-        //拼接业务编号
-        String seqNo = prefix + date + sequence;
-        //logger.info("KEY:{}, 序列号生成:{}, 过期时间:{}", key, seqNo, String.format("%tF %tT ", expireDate, expireDate));
-        return seqNo;
-    }
-
-    /**
-     * @param key
-     * @param expireTime <i>过期时间</i>
-     * @return
-     */
-    public static long generate(RedisTemplate<?,?> redisTemplate,String key,Date expireTime) {
-        //RedisAtomicLong为原子类，根据传入的key和redis链接工厂创建原子类
-        RedisAtomicLong counter = new RedisAtomicLong(key,redisTemplate.getConnectionFactory());
-        //设置过期时间
-        counter.expireAt(expireTime);
-        //返回redis中key的值，内部实现下面详细说明
-        return counter.incrementAndGet();
-    }
-}
+package com.sckw.redis.utils;
+
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.support.atomic.RedisAtomicLong;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * 生成订单流水号18  * 精确到秒级，后面加随机数（redis获取）
+ * <p>
+ * 通过增加随机性，修正因宿主机时钟回拨导致生成重复值的bug
+ * key改为按日期，最后的拼接用取模的方式防止数据越界，②解决concat带来的bug。
+ *
+ * @author wangzaizhou
+ **/
+@Component
+@Slf4j
+public class GenerateOrderIdUtil {
+    //private static Logger logger = LoggerFactory.getLogger(SequenceService.class);
+
+    @Resource
+    private RedisTemplate redisTemplate;
+
+    //用作存放redis中的key
+    private static String ORDER_KEY = "order_key";
+
+    //生成特定的业务编号，prefix为特定的业务代码
+    public String getOrderNo(String prefix){
+        return getSeqNo(ORDER_KEY, prefix);
+    }
+
+    //SequenceService类中公用部分，传入制定的key和prefix
+    private String getSeqNo(String key, String prefix)
+    {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+        calendar.set(Calendar.MILLISECOND, 999);
+        //设置过期时间，这里设置为当天的23:59:59
+        Date expireDate = calendar.getTime();
+        //返回当前redis中的key的最大值
+        Long seq = generate(redisTemplate, key, expireDate);
+        //获取当天的日期，格式为yyyyMMdd
+        String date = new SimpleDateFormat("yyyyMMdd").format(expireDate);
+        //生成八为的序列号，如果seq不够八位，seq前面补0，
+        //如果seq位数超过了八位，那么无需补0直接返回当前的seq
+        String sequence = String.format("%08d", Integer.parseInt(seq.toString()));
+        if (prefix == null)
+        {
+            prefix = "";
+        }
+        //拼接业务编号
+        String seqNo = prefix + date + sequence;
+        //logger.info("KEY:{}, 序列号生成:{}, 过期时间:{}", key, seqNo, String.format("%tF %tT ", expireDate, expireDate));
+        return seqNo;
+    }
+
+    /**
+     * @param key
+     * @param expireTime <i>过期时间</i>
+     * @return
+     */
+    public static long generate(RedisTemplate<?,?> redisTemplate,String key,Date expireTime) {
+        //RedisAtomicLong为原子类，根据传入的key和redis链接工厂创建原子类
+        RedisAtomicLong counter = new RedisAtomicLong(key,redisTemplate.getConnectionFactory());
+        //设置过期时间
+        counter.expireAt(expireTime);
+        //返回redis中key的值，内部实现下面详细说明
+        return counter.incrementAndGet();
+    }
+}

business-common/business-common-redis/src/main/java/com/sckw/redis/utils/SnowflakeIdWorker.java

@@ -1,139 +1,139 @@
-package com.sckw.redis.utils;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-04-18
- */
-public class SnowflakeIdWorker {
-
-    //开始时间截 (2015-01-01)
-    private final long START_TIME_STAMP = 1420041600000L;
-
-    /**
-     * 每一部分占用的位数
-     */
-    //序列号占用的位数
-    private final long SEQUENCE_BIT = 12L;
-    //机器标识占用的位数
-    private final long MACHINE_BIT = 5L;
-    //数据中心占用的位数
-    private final long DATACENTER_BIT = 5L;
-
-
-    /**
-     * 每一部分的最大值
-     */
-    //最大数据中心数量，结果是31
-    private final long MAX_DATACENTER_NUM = -1L ^ (-1L << DATACENTER_BIT);
-
-    //最大机器数量，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数)
-    private final long MAX_MACHINE_NUM = -1L ^ (-1L << MACHINE_BIT);
-
-    //最大序列，这里为4095 (0b111111111111=0xfff=4095)
-    private final long MAX_SEQUENCE = -1L ^ (-1L << SEQUENCE_BIT);
-
-
-    /**
-     * 每一部分向左的位移
-     */
-    //机器ID向左移12位
-    private final long MACHINE_ID_LEFT = SEQUENCE_BIT;
-
-    //数据中心id向左移17位(12+5)
-    private final long DATACENTER_ID_LEFT = SEQUENCE_BIT + MACHINE_BIT;
-
-    //时间截向左移22位(5+5+12)
-    private final long TIME_STAMP_LEFT = SEQUENCE_BIT + MACHINE_BIT + DATACENTER_BIT;
-
-
-    //数据中心ID(0~31)
-    private long datacenterId;
-
-    //机器ID(0~31)
-    private long machineId;
-
-    //序列号 { 毫秒内序列(0~4095)}
-    private long sequence = 0L;
-
-    //上一次时间戳
-    private long lastTimestamp = -1L;
-
-
-    /**
-     * 构造函数
-     *
-     * @param machineId    工作ID (0~31)
-     * @param datacenterId 数据中心ID (0~31)
-     */
-    public SnowflakeIdWorker(long machineId, long datacenterId) {
-        if (machineId > MAX_MACHINE_NUM || machineId < 0) {
-            throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", MAX_MACHINE_NUM));
-        }
-        if (datacenterId > MAX_DATACENTER_NUM || datacenterId < 0) {
-            throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", MAX_DATACENTER_NUM));
-        }
-        this.machineId = machineId;
-        this.datacenterId = datacenterId;
-    }
-
-
-    /**
-     * 获得下一个ID (该方法是线程安全的)
-     *
-     * @return SnowflakeId
-     */
-    public synchronized long nextId() {
-
-        long currentTimeStamp = getCurrentTimeStamp();
-        //如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常
-        if (currentTimeStamp < lastTimestamp) {
-            throw new RuntimeException(String.format("Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - currentTimeStamp));
-        }
-        //如果是同一时间生成的，则进行毫秒内序列
-        if (currentTimeStamp == lastTimestamp) {
-            //相同毫秒内，序列号自增
-            sequence = (sequence + 1) & MAX_SEQUENCE;
-            //毫秒内序列溢出
-            if (sequence == 0) {
-                //阻塞到下一个毫秒,获得新的时间戳
-                currentTimeStamp = getNewTimeStamp(lastTimestamp);
-            }
-        }
-        //时间戳改变，毫秒内序列重置
-        else {
-            sequence = 0L;
-        }
-        //上次生成ID的时间截
-        lastTimestamp = currentTimeStamp;
-        //移位并通过或运算拼到一起组成64位的ID
-        return ((currentTimeStamp - START_TIME_STAMP) << TIME_STAMP_LEFT) //时间戳部分
-                | (datacenterId << DATACENTER_ID_LEFT) //数据中心部分
-                | (machineId << MACHINE_ID_LEFT) //机器标识部分
-                | sequence;  //序列号部分
-    }
-
-
-    /**
-     * 返回以毫秒为单位的当前时间
-     */
-    protected long getCurrentTimeStamp() {
-        return System.currentTimeMillis();
-    }
-
-    /**
-     * 获得新的时间戳
-     *
-     * @param lastTimestamp 上次生成ID的时间截
-     */
-    protected long getNewTimeStamp(long lastTimestamp) {
-        long timestamp = getCurrentTimeStamp();
-        while (timestamp <= lastTimestamp) {
-            timestamp = getCurrentTimeStamp();
-        }
-        return timestamp;
-    }
-
-}
-
-
+package com.sckw.redis.utils;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-04-18
+ */
+public class SnowflakeIdWorker {
+
+    //开始时间截 (2015-01-01)
+    private final long START_TIME_STAMP = 1420041600000L;
+
+    /**
+     * 每一部分占用的位数
+     */
+    //序列号占用的位数
+    private final long SEQUENCE_BIT = 12L;
+    //机器标识占用的位数
+    private final long MACHINE_BIT = 5L;
+    //数据中心占用的位数
+    private final long DATACENTER_BIT = 5L;
+
+
+    /**
+     * 每一部分的最大值
+     */
+    //最大数据中心数量，结果是31
+    private final long MAX_DATACENTER_NUM = -1L ^ (-1L << DATACENTER_BIT);
+
+    //最大机器数量，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数)
+    private final long MAX_MACHINE_NUM = -1L ^ (-1L << MACHINE_BIT);
+
+    //最大序列，这里为4095 (0b111111111111=0xfff=4095)
+    private final long MAX_SEQUENCE = -1L ^ (-1L << SEQUENCE_BIT);
+
+
+    /**
+     * 每一部分向左的位移
+     */
+    //机器ID向左移12位
+    private final long MACHINE_ID_LEFT = SEQUENCE_BIT;
+
+    //数据中心id向左移17位(12+5)
+    private final long DATACENTER_ID_LEFT = SEQUENCE_BIT + MACHINE_BIT;
+
+    //时间截向左移22位(5+5+12)
+    private final long TIME_STAMP_LEFT = SEQUENCE_BIT + MACHINE_BIT + DATACENTER_BIT;
+
+
+    //数据中心ID(0~31)
+    private long datacenterId;
+
+    //机器ID(0~31)
+    private long machineId;
+
+    //序列号 { 毫秒内序列(0~4095)}
+    private long sequence = 0L;
+
+    //上一次时间戳
+    private long lastTimestamp = -1L;
+
+
+    /**
+     * 构造函数
+     *
+     * @param machineId    工作ID (0~31)
+     * @param datacenterId 数据中心ID (0~31)
+     */
+    public SnowflakeIdWorker(long machineId, long datacenterId) {
+        if (machineId > MAX_MACHINE_NUM || machineId < 0) {
+            throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", MAX_MACHINE_NUM));
+        }
+        if (datacenterId > MAX_DATACENTER_NUM || datacenterId < 0) {
+            throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", MAX_DATACENTER_NUM));
+        }
+        this.machineId = machineId;
+        this.datacenterId = datacenterId;
+    }
+
+
+    /**
+     * 获得下一个ID (该方法是线程安全的)
+     *
+     * @return SnowflakeId
+     */
+    public synchronized long nextId() {
+
+        long currentTimeStamp = getCurrentTimeStamp();
+        //如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常
+        if (currentTimeStamp < lastTimestamp) {
+            throw new RuntimeException(String.format("Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - currentTimeStamp));
+        }
+        //如果是同一时间生成的，则进行毫秒内序列
+        if (currentTimeStamp == lastTimestamp) {
+            //相同毫秒内，序列号自增
+            sequence = (sequence + 1) & MAX_SEQUENCE;
+            //毫秒内序列溢出
+            if (sequence == 0) {
+                //阻塞到下一个毫秒,获得新的时间戳
+                currentTimeStamp = getNewTimeStamp(lastTimestamp);
+            }
+        }
+        //时间戳改变，毫秒内序列重置
+        else {
+            sequence = 0L;
+        }
+        //上次生成ID的时间截
+        lastTimestamp = currentTimeStamp;
+        //移位并通过或运算拼到一起组成64位的ID
+        return ((currentTimeStamp - START_TIME_STAMP) << TIME_STAMP_LEFT) //时间戳部分
+                | (datacenterId << DATACENTER_ID_LEFT) //数据中心部分
+                | (machineId << MACHINE_ID_LEFT) //机器标识部分
+                | sequence;  //序列号部分
+    }
+
+
+    /**
+     * 返回以毫秒为单位的当前时间
+     */
+    protected long getCurrentTimeStamp() {
+        return System.currentTimeMillis();
+    }
+
+    /**
+     * 获得新的时间戳
+     *
+     * @param lastTimestamp 上次生成ID的时间截
+     */
+    protected long getNewTimeStamp(long lastTimestamp) {
+        long timestamp = getCurrentTimeStamp();
+        while (timestamp <= lastTimestamp) {
+            timestamp = getCurrentTimeStamp();
+        }
+        return timestamp;
+    }
+
+}
+
+

business-common/business-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,2 +1,2 @@
-com.sckw.redis.config.RedissonConfig
-com.sckw.redis.config.RedisLockUtil
+com.sckw.redis.config.RedissonConfig
+com.sckw.redis.config.RedisLockUtil

business-modules-web/business-transport-start/pom.xml

@@ -143,6 +143,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -152,13 +153,6 @@
                 </executions>
                 <configuration>
                     <mainClass>com.sckw.transport.TransportStartApplication</mainClass>
-                </configuration>
-            </plugin>
-            <!-- maven 打包插件 -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
                     <includeSystemScope>true</includeSystemScope>
                 </configuration>
             </plugin>
@@ -173,4 +167,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

business-modules-web/business-transport-start/src/main/java/com/sckw/transport/TransportStartApplication.java

@@ -1,19 +1,19 @@
-package com.sckw.transport;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
-
-/**
- * @date 2024/5/11 0011
- */
-@ComponentScan({"com.sckw.*"})
-@MapperScan({"com.sckw.*"})
-@SpringBootApplication
-public class TransportStartApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(TransportStartApplication.class, args);
-    }
-}
+package com.sckw.transport;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+
+/**
+ * @date 2024/5/11 0011
+ */
+@ComponentScan({"com.sckw.*"})
+@MapperScan({"com.sckw.*"})
+@SpringBootApplication
+public class TransportStartApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(TransportStartApplication.class, args);
+    }
+}

business-modules-web/business-transport-start/src/main/java/com/sckw/transport/config/CorsConfig.java

@@ -1,23 +1,23 @@
-package com.sckw.transport.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-05-23
- */
-@Configuration
-public class CorsConfig implements WebMvcConfigurer {
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**") // 所有接口
-                .allowCredentials(true) // 是否发送 Cookie
-                .allowedOriginPatterns("*") // 支持域
-                .allowedMethods(new String[]{"GET", "POST", "PUT", "DELETE"}) // 支持方法
-                .allowedHeaders("*")
-                .exposedHeaders("*");
-    }
-}
+package com.sckw.transport.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-23
+ */
+@Configuration
+public class CorsConfig implements WebMvcConfigurer {
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**") // 所有接口
+                .allowCredentials(true) // 是否发送 Cookie
+                .allowedOriginPatterns("*") // 支持域
+                .allowedMethods(new String[]{"GET", "POST", "PUT", "DELETE"}) // 支持方法
+                .allowedHeaders("*")
+                .exposedHeaders("*");
+    }
+}

business-modules-web/business-transport-start/src/main/java/com/sckw/transport/plugin/Myplugin.java

@@ -1,57 +1,57 @@
-package com.sckw.transport.plugin;
-
-import org.apache.ibatis.executor.Executor;
-import org.apache.ibatis.mapping.MappedStatement;
-import org.apache.ibatis.mapping.SqlCommandType;
-import org.apache.ibatis.plugin.*;
-import org.springframework.stereotype.Component;
-
-import java.lang.reflect.Field;
-import java.util.Properties;
-
-/**
- * @desc: 自动填充
- * @author: Lt
- * @date: 2024-05-15
- */
-@Intercepts(
-        @Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class})
-)
-@Component
-public class Myplugin implements Interceptor {
-    //获取到拦截的对象，底层也是通过代理来实现的，实际上是拿到一个目标的代理对象
-    @Override
-    public Object plugin(Object target) {
-        return Plugin.wrap(target,this);
-    }
-
-    //获取配置文件中设置的阈值等参数
-    @Override
-    public void setProperties(Properties properties) {
-
-    }
-    @Override
-    public Object intercept(Invocation invocation) throws Throwable {
-        MappedStatement mappedStatement = (MappedStatement)invocation.getArgs()[0];
-        //获取操作类型，crud
-        SqlCommandType sqlCommandType = mappedStatement.getSqlCommandType();
-        //获取参数
-        Object parameter = invocation.getArgs()[1];
-        Field[]fields = parameter.getClass().getDeclaredFields();
-
-
-        for(Field field: fields){
-            //注入对应的属性值
-            if ("createBy".equals(field.getName())&&SqlCommandType.INSERT.equals(sqlCommandType)){
-                field.setAccessible(true);
-                field.set(parameter,"admin");
-            }
-            if ("updateBy".equals(field.getName())&&SqlCommandType.UPDATE.equals(sqlCommandType)){
-                field.setAccessible(true);
-                field.set(parameter,"admin");
-            }
-        }
-
-        return invocation.proceed();
-    }
-}
+package com.sckw.transport.plugin;
+
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.SqlCommandType;
+import org.apache.ibatis.plugin.*;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Field;
+import java.util.Properties;
+
+/**
+ * @desc: 自动填充
+ * @author: Lt
+ * @date: 2024-05-15
+ */
+@Intercepts(
+        @Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class})
+)
+@Component
+public class Myplugin implements Interceptor {
+    //获取到拦截的对象，底层也是通过代理来实现的，实际上是拿到一个目标的代理对象
+    @Override
+    public Object plugin(Object target) {
+        return Plugin.wrap(target,this);
+    }
+
+    //获取配置文件中设置的阈值等参数
+    @Override
+    public void setProperties(Properties properties) {
+
+    }
+    @Override
+    public Object intercept(Invocation invocation) throws Throwable {
+        MappedStatement mappedStatement = (MappedStatement)invocation.getArgs()[0];
+        //获取操作类型，crud
+        SqlCommandType sqlCommandType = mappedStatement.getSqlCommandType();
+        //获取参数
+        Object parameter = invocation.getArgs()[1];
+        Field[]fields = parameter.getClass().getDeclaredFields();
+
+
+        for(Field field: fields){
+            //注入对应的属性值
+            if ("createBy".equals(field.getName())&&SqlCommandType.INSERT.equals(sqlCommandType)){
+                field.setAccessible(true);
+                field.set(parameter,"admin");
+            }
+            if ("updateBy".equals(field.getName())&&SqlCommandType.UPDATE.equals(sqlCommandType)){
+                field.setAccessible(true);
+                field.set(parameter,"admin");
+            }
+        }
+
+        return invocation.proceed();
+    }
+}

business-modules/business-address/src/main/java/com/sckw/address/controller/AddressController.java

@@ -1,94 +1,94 @@
-package com.sckw.address.controller;
-
-import com.sckw.address.entity.vo.req.KwBusinessAddressListParam;
-import com.sckw.address.entity.vo.req.KwBusinessAddressPageListParam;
-import com.sckw.address.entity.vo.req.KwBusinessAddressParam;
-import com.sckw.address.entity.vo.res.KwBusinessAddressListRes;
-import com.sckw.address.service.KwAddressService;
-import com.sckw.core.model.page.PageRes;
-import com.sckw.core.web.response.HttpResult;
-import jakarta.validation.Valid;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @desc: 地址服务
- * @author: Lt
- * @date: 2024-04-11
- */
-@Validated
-@RestController
-@RequestMapping(value = "/address")
-public class AddressController {
-
-    @Autowired
-    KwAddressService kwAddressService;
-
-    /**
-    * @Description: 地址新增
-    * @Author: Lt
-    * @Date: 2024/4/11 15:54
-    */
-    @PostMapping(value = "/save")
-    public HttpResult addressCreate(@RequestBody @Valid KwBusinessAddressParam kwBusinessAddressParam)
-    {
-        return kwAddressService.addressCreate(kwBusinessAddressParam);
-    }
-
-    /**
-     * @Description: 地址编辑
-     * @Author: Lt
-     * @Date: 2024/4/11 15:54
-     */
-    @PostMapping(value = "/update")
-    public HttpResult addressUpdate(@RequestBody @Valid KwBusinessAddressParam kwBusinessAddressParam)
-    {
-        return kwAddressService.addressUpdate(kwBusinessAddressParam);
-    }
-
-    /**
-    * @Description: 地址删除
-    * @Author: Lt
-    * @Date: 2024/4/11 16:43
-    */
-    @PostMapping(value = "/delete")
-    public HttpResult delete(@RequestParam("id") String id){
-
-        return kwAddressService.addressDelete(id);
-    }
-
-    /**
-    * @Description: 地址查询
-    * @Author: Lt
-    * @Date: 2024/4/11 16:43
-    */
-    @GetMapping("/find")
-    public HttpResult find(@RequestParam("id") String id){
-        return kwAddressService.addressFind(id);
-    }
-
-    /**
-    * @Description: 地址分页查询
-    * @Author: Lt
-    * @Date: 2024/4/11 16:51
-    */
-    @PostMapping(value = "/selectPageList")
-    public HttpResult pageList(@RequestBody @Valid KwBusinessAddressPageListParam kwBusinessAddressListParam)
-    {
-        return kwAddressService.addressPageList(kwBusinessAddressListParam);
-    }
-
-    /**
-     * @Description: 地址查询
-     * @Author: Lt
-     * @Date: 2024/4/11 16:51
-     */
-    @PostMapping(value = "/select")
-    public HttpResult list(@RequestBody(required = false) KwBusinessAddressListParam kwBusinessAddressListParam)
-    {
-        PageRes<KwBusinessAddressListRes> list = kwAddressService.selectList(kwBusinessAddressListParam);
-        return HttpResult.ok(list);
-    }
-
-}
+package com.sckw.address.controller;
+
+import com.sckw.address.entity.vo.req.KwBusinessAddressListParam;
+import com.sckw.address.entity.vo.req.KwBusinessAddressPageListParam;
+import com.sckw.address.entity.vo.req.KwBusinessAddressParam;
+import com.sckw.address.entity.vo.res.KwBusinessAddressListRes;
+import com.sckw.address.service.KwAddressService;
+import com.sckw.core.model.page.PageRes;
+import com.sckw.core.web.response.HttpResult;
+import jakarta.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @desc: 地址服务
+ * @author: Lt
+ * @date: 2024-04-11
+ */
+@Validated
+@RestController
+@RequestMapping(value = "/address")
+public class AddressController {
+
+    @Autowired
+    KwAddressService kwAddressService;
+
+    /**
+    * @Description: 地址新增
+    * @Author: Lt
+    * @Date: 2024/4/11 15:54
+    */
+    @PostMapping(value = "/save")
+    public HttpResult addressCreate(@RequestBody @Valid KwBusinessAddressParam kwBusinessAddressParam)
+    {
+        return kwAddressService.addressCreate(kwBusinessAddressParam);
+    }
+
+    /**
+     * @Description: 地址编辑
+     * @Author: Lt
+     * @Date: 2024/4/11 15:54
+     */
+    @PostMapping(value = "/update")
+    public HttpResult addressUpdate(@RequestBody @Valid KwBusinessAddressParam kwBusinessAddressParam)
+    {
+        return kwAddressService.addressUpdate(kwBusinessAddressParam);
+    }
+
+    /**
+    * @Description: 地址删除
+    * @Author: Lt
+    * @Date: 2024/4/11 16:43
+    */
+    @PostMapping(value = "/delete")
+    public HttpResult delete(@RequestParam("id") String id){
+
+        return kwAddressService.addressDelete(id);
+    }
+
+    /**
+    * @Description: 地址查询
+    * @Author: Lt
+    * @Date: 2024/4/11 16:43
+    */
+    @GetMapping("/find")
+    public HttpResult find(@RequestParam("id") String id){
+        return kwAddressService.addressFind(id);
+    }
+
+    /**
+    * @Description: 地址分页查询
+    * @Author: Lt
+    * @Date: 2024/4/11 16:51
+    */
+    @PostMapping(value = "/selectPageList")
+    public HttpResult pageList(@RequestBody @Valid KwBusinessAddressPageListParam kwBusinessAddressListParam)
+    {
+        return kwAddressService.addressPageList(kwBusinessAddressListParam);
+    }
+
+    /**
+     * @Description: 地址查询
+     * @Author: Lt
+     * @Date: 2024/4/11 16:51
+     */
+    @PostMapping(value = "/select")
+    public HttpResult list(@RequestBody(required = false) KwBusinessAddressListParam kwBusinessAddressListParam)
+    {
+        PageRes<KwBusinessAddressListRes> list = kwAddressService.selectList(kwBusinessAddressListParam);
+        return HttpResult.ok(list);
+    }
+
+}

business-modules/business-address/src/main/java/com/sckw/address/controller/AddressTypeController.java

@@ -1,72 +1,72 @@
-package com.sckw.address.controller;
-
-import com.sckw.address.entity.vo.req.KwBusinessAddressTypeInsertParam;
-import com.sckw.address.service.KwBusinessAddressTypeService;
-import com.sckw.core.web.response.HttpResult;
-import jakarta.validation.Valid;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @desc: 地址类型
- * @author: Lt
- * @date: 2024-04-12
- */
-@Validated
-@RestController
-@RequestMapping(value = "/addressType")
-public class AddressTypeController {
-
-    @Autowired
-    KwBusinessAddressTypeService kwBusinessAddressTypeService;
-
-    /**
-    * @Description: 地址类型新增
-    * @Author: Lt
-    * @Date: 2024/4/12 8:58
-    */
-    @PostMapping(value = "/addressTypeInsert")
-    public HttpResult addressTypeInsert(@RequestBody @Valid KwBusinessAddressTypeInsertParam kwBusinessAddressTypeInsertParam)
-    {
-        return kwBusinessAddressTypeService.addressTypeInsert(kwBusinessAddressTypeInsertParam);
-    }
-
-    /**
-     * @Description: 地址类型编辑
-     * @Author: Lt
-     * @Date: 2024/4/12 8:58
-     */
-    @PostMapping(value = "/addressTypeUpdate")
-    public HttpResult addressTypeUpdate(@RequestBody @Valid KwBusinessAddressTypeInsertParam kwBusinessAddressTypeInsertParam)
-    {
-        return kwBusinessAddressTypeService.addressTypeUpdate(kwBusinessAddressTypeInsertParam);
-    }
-
-    /**
-     * @Description: 地址类型删除
-     * @Author: Lt
-     * @Date: 2024/4/12 8:58
-     */
-    @PostMapping(value = "/delete")
-    public HttpResult addressTypeDelete(@RequestParam(value = "id", required = false) String id)
-    {
-        return kwBusinessAddressTypeService.addressTypeDelete(id);
-    }
-
-    /**
-     * @Description: 地址List
-     * @Author: Lt
-     * @Date: 2024/4/11 16:51
-     */
-    @PostMapping(value = "/list")
-    public HttpResult list(@RequestParam(value = "name", required = false) String name)
-    {
-        return HttpResult.ok(kwBusinessAddressTypeService.selectList(name));
-    }
-
-
-
-
-
-}
+package com.sckw.address.controller;
+
+import com.sckw.address.entity.vo.req.KwBusinessAddressTypeInsertParam;
+import com.sckw.address.service.KwBusinessAddressTypeService;
+import com.sckw.core.web.response.HttpResult;
+import jakarta.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @desc: 地址类型
+ * @author: Lt
+ * @date: 2024-04-12
+ */
+@Validated
+@RestController
+@RequestMapping(value = "/addressType")
+public class AddressTypeController {
+
+    @Autowired
+    KwBusinessAddressTypeService kwBusinessAddressTypeService;
+
+    /**
+    * @Description: 地址类型新增
+    * @Author: Lt
+    * @Date: 2024/4/12 8:58
+    */
+    @PostMapping(value = "/addressTypeInsert")
+    public HttpResult addressTypeInsert(@RequestBody @Valid KwBusinessAddressTypeInsertParam kwBusinessAddressTypeInsertParam)
+    {
+        return kwBusinessAddressTypeService.addressTypeInsert(kwBusinessAddressTypeInsertParam);
+    }
+
+    /**
+     * @Description: 地址类型编辑
+     * @Author: Lt
+     * @Date: 2024/4/12 8:58
+     */
+    @PostMapping(value = "/addressTypeUpdate")
+    public HttpResult addressTypeUpdate(@RequestBody @Valid KwBusinessAddressTypeInsertParam kwBusinessAddressTypeInsertParam)
+    {
+        return kwBusinessAddressTypeService.addressTypeUpdate(kwBusinessAddressTypeInsertParam);
+    }
+
+    /**
+     * @Description: 地址类型删除
+     * @Author: Lt
+     * @Date: 2024/4/12 8:58
+     */
+    @PostMapping(value = "/delete")
+    public HttpResult addressTypeDelete(@RequestParam(value = "id", required = false) String id)
+    {
+        return kwBusinessAddressTypeService.addressTypeDelete(id);
+    }
+
+    /**
+     * @Description: 地址List
+     * @Author: Lt
+     * @Date: 2024/4/11 16:51
+     */
+    @PostMapping(value = "/list")
+    public HttpResult list(@RequestParam(value = "name", required = false) String name)
+    {
+        return HttpResult.ok(kwBusinessAddressTypeService.selectList(name));
+    }
+
+
+
+
+
+}

business-modules/business-address/src/main/java/com/sckw/address/entity/KwBusinessAddress.java

@@ -1,91 +1,91 @@
-package com.sckw.address.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-04-11
- */
-@Data
-public class KwBusinessAddress implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private Long id;
-
-    /**
-     * 地址名称
-     */
-    private String name;
-
-    /**
-     * 所属区域
-     */
-    private String ownRegion;
-
-    /**
-     * 所属区域名称
-     */
-    private String cityName;
-
-    /**
-     * 所在地区
-     */
-    private Integer cityCode;
-
-    /**
-     * 地址详情
-     */
-    private String detail;
-
-    /**
-     * 地址类型
-     */
-    private Long type;
-
-    /**
-     * lat
-     */
-    private String lat;
-
-    /**
-     * lng
-     */
-    private String lng;
-
-    /**
-     * 电子围栏
-     */
-    private String fence;
-
-    /**
-     * create_by
-     */
-    private String createBy;
-
-    /**
-     * update_by
-     */
-    private String updateBy;
-
-    /**
-     * create_time
-     */
-    private Date createTime;
-
-    /**
-     * update_time
-     */
-    private Date updateTime;
-
-    /**
-     * del_flag
-     */
-    private Integer delFlag;
-}
+package com.sckw.address.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-04-11
+ */
+@Data
+public class KwBusinessAddress implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 地址名称
+     */
+    private String name;
+
+    /**
+     * 所属区域
+     */
+    private String ownRegion;
+
+    /**
+     * 所属区域名称
+     */
+    private String cityName;
+
+    /**
+     * 所在地区
+     */
+    private Integer cityCode;
+
+    /**
+     * 地址详情
+     */
+    private String detail;
+
+    /**
+     * 地址类型
+     */
+    private Long type;
+
+    /**
+     * lat
+     */
+    private String lat;
+
+    /**
+     * lng
+     */
+    private String lng;
+
+    /**
+     * 电子围栏
+     */
+    private String fence;
+
+    /**
+     * create_by
+     */
+    private String createBy;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+    /**
+     * create_time
+     */
+    private Date createTime;
+
+    /**
+     * update_time
+     */
+    private Date updateTime;
+
+    /**
+     * del_flag
+     */
+    private Integer delFlag;
+}

business-modules/business-address/src/main/java/com/sckw/address/entity/KwBusinessAddressType.java

@@ -1,56 +1,56 @@
-package com.sckw.address.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @desc: kw_business_address_type
- * @author: Lt
- * @date: 2024-04-12
- */
-@Data
-public class KwBusinessAddressType implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private Long id;
-
-    /**
-     * 类型名称
-     */
-    private String name;
-
-    /**
-     * 类型状态  0=正常
-     */
-    private Integer status;
-
-    /**
-     * create_by
-     */
-    private String createBy;
-
-    /**
-     * update_by
-     */
-    private String updateBy;
-
-    /**
-     * create_time
-     */
-    private Date createTime;
-
-    /**
-     * update_time
-     */
-    private Date updateTime;
-
-    /**
-     * del_flag
-     */
-    private Integer delFlag;
-}
+package com.sckw.address.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @desc: kw_business_address_type
+ * @author: Lt
+ * @date: 2024-04-12
+ */
+@Data
+public class KwBusinessAddressType implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 类型名称
+     */
+    private String name;
+
+    /**
+     * 类型状态  0=正常
+     */
+    private Integer status;
+
+    /**
+     * create_by
+     */
+    private String createBy;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+    /**
+     * create_time
+     */
+    private Date createTime;
+
+    /**
+     * update_time
+     */
+    private Date updateTime;
+
+    /**
+     * del_flag
+     */
+    private Integer delFlag;
+}

business-modules/business-address/src/main/java/com/sckw/address/entity/vo/req/KwBusinessAddressListParam.java

@@ -1,17 +1,17 @@
-package com.sckw.address.entity.vo.req;
-
-import lombok.Data;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-05-06
- */
-@Data
-public class KwBusinessAddressListParam {
-    private Integer page;
-
-    private Integer pageSize;
-
-    private String name;
-}
+package com.sckw.address.entity.vo.req;
+
+import lombok.Data;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-06
+ */
+@Data
+public class KwBusinessAddressListParam {
+    private Integer page;
+
+    private Integer pageSize;
+
+    private String name;
+}

business-modules/business-address/src/main/java/com/sckw/address/entity/vo/req/KwBusinessAddressPageListParam.java

@@ -1,23 +1,23 @@
-package com.sckw.address.entity.vo.req;
-
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-04-11
- */
-@Data
-public class KwBusinessAddressPageListParam {
-
-    @NotNull(message = "分页必填")
-    private Integer page;
-
-    @NotNull(message = "分页数必填")
-    private Integer pageSize;
-
-    private Long type;
-
-    private String name;
-}
+package com.sckw.address.entity.vo.req;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-04-11
+ */
+@Data
+public class KwBusinessAddressPageListParam {
+
+    @NotNull(message = "分页必填")
+    private Integer page;
+
+    @NotNull(message = "分页数必填")
+    private Integer pageSize;
+
+    private Long type;
+
+    private String name;
+}

business-modules/business-address/src/main/java/com/sckw/address/entity/vo/req/KwBusinessAddressParam.java

@@ -1,81 +1,81 @@
-package com.sckw.address.entity.vo.req;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-04-11
- */
-@Data
-public class KwBusinessAddressParam implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private Long id;
-
-    /**
-     * 地址名称
-     */
-    private String name;
-
-    /**
-     * 所属区域
-     */
-    private String ownRegion;
-
-    /**
-     * 地址详情
-     */
-    private String detail;
-
-    /**
-     * 地址类型
-     */
-    private Long type;
-
-    /**
-     * lat
-     */
-    private String lat;
-
-    /**
-     * lng
-     */
-    private String lng;
-
-    /**
-     * 电子围栏
-     */
-    private String fence;
-
-    /**
-     * create_by
-     */
-    private String createBy;
-
-    /**
-     * update_by
-     */
-    private String updateBy;
-
-    /**
-     * create_time
-     */
-    private Date createTime;
-
-    /**
-     * update_time
-     */
-    private Date updateTime;
-
-    /**
-     * del_flag
-     */
-    private Integer delFlag;
-}
+package com.sckw.address.entity.vo.req;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-04-11
+ */
+@Data
+public class KwBusinessAddressParam implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 地址名称
+     */
+    private String name;
+
+    /**
+     * 所属区域
+     */
+    private String ownRegion;
+
+    /**
+     * 地址详情
+     */
+    private String detail;
+
+    /**
+     * 地址类型
+     */
+    private Long type;
+
+    /**
+     * lat
+     */
+    private String lat;
+
+    /**
+     * lng
+     */
+    private String lng;
+
+    /**
+     * 电子围栏
+     */
+    private String fence;
+
+    /**
+     * create_by
+     */
+    private String createBy;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+    /**
+     * create_time
+     */
+    private Date createTime;
+
+    /**
+     * update_time
+     */
+    private Date updateTime;
+
+    /**
+     * del_flag
+     */
+    private Integer delFlag;
+}

business-modules/business-address/src/main/java/com/sckw/address/entity/vo/req/KwBusinessAddressTypeInsertParam.java

@@ -1,27 +1,27 @@
-package com.sckw.address.entity.vo.req;
-
-import lombok.Data;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-04-12
- */
-@Data
-public class KwBusinessAddressTypeInsertParam {
-
-    /**
-     * 地址id
-     */
-    private Long id;
-
-    /**
-     * 类型名称
-     */
-    private String name;
-
-    /**
-     * 类型状态  0=正常
-     */
-    private Integer status;
-}
+package com.sckw.address.entity.vo.req;
+
+import lombok.Data;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-04-12
+ */
+@Data
+public class KwBusinessAddressTypeInsertParam {
+
+    /**
+     * 地址id
+     */
+    private Long id;
+
+    /**
+     * 类型名称
+     */
+    private String name;
+
+    /**
+     * 类型状态  0=正常
+     */
+    private Integer status;
+}

business-modules/business-address/src/main/java/com/sckw/address/entity/vo/res/KwBusinessAddressListRes.java

@@ -1,15 +1,15 @@
-package com.sckw.address.entity.vo.res;
-
-import lombok.Data;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-04-11
- */
-@Data
-public class KwBusinessAddressListRes {
-
-    private String id;
-    private String name;
-}
+package com.sckw.address.entity.vo.res;
+
+import lombok.Data;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-04-11
+ */
+@Data
+public class KwBusinessAddressListRes {
+
+    private String id;
+    private String name;
+}

business-modules/business-address/src/main/java/com/sckw/address/entity/vo/res/KwBusinessAddressTypeListRes.java

@@ -1,15 +1,15 @@
-package com.sckw.address.entity.vo.res;
-
-import lombok.Data;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-04-12
- */
-@Data
-public class KwBusinessAddressTypeListRes {
-    private Long id;
-
-    private String name;
-}
+package com.sckw.address.entity.vo.res;
+
+import lombok.Data;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-04-12
+ */
+@Data
+public class KwBusinessAddressTypeListRes {
+    private Long id;
+
+    private String name;
+}

business-modules/business-address/src/main/java/com/sckw/address/entity/vo/res/KwBusinessPageListRes.java

@@ -1,79 +1,79 @@
-package com.sckw.address.entity.vo.res;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-04-11
- */
-@Data
-public class KwBusinessPageListRes {
-
-    /**
-     * id
-     */
-    private Long id;
-
-    /**
-     * 地址名称
-     */
-    private String name;
-
-    /**
-     * 所属区域
-     */
-    private String ownRegion;
-
-    /**
-     * 地址详情
-     */
-    private String detail;
-
-    /**
-     * 地址类型
-     */
-    private Long type;
-    private String typeStr;
-
-    /**
-     * lat
-     */
-    private String lat;
-
-    /**
-     * lng
-     */
-    private String lng;
-
-    /**
-     * 电子围栏
-     */
-    private String fence;
-
-    /**
-     * create_by
-     */
-    private String createBy;
-
-    /**
-     * update_by
-     */
-    private String updateBy;
-
-    /**
-     * create_time
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
-
-    /**
-     * update_time
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date updateTime;
-}
-
+package com.sckw.address.entity.vo.res;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-04-11
+ */
+@Data
+public class KwBusinessPageListRes {
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 地址名称
+     */
+    private String name;
+
+    /**
+     * 所属区域
+     */
+    private String ownRegion;
+
+    /**
+     * 地址详情
+     */
+    private String detail;
+
+    /**
+     * 地址类型
+     */
+    private Long type;
+    private String typeStr;
+
+    /**
+     * lat
+     */
+    private String lat;
+
+    /**
+     * lng
+     */
+    private String lng;
+
+    /**
+     * 电子围栏
+     */
+    private String fence;
+
+    /**
+     * create_by
+     */
+    private String createBy;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+    /**
+     * create_time
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * update_time
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+}
+

business-modules/business-address/src/main/java/com/sckw/address/mapper/KwBusinessAddressMapper.java

@@ -1,23 +1,23 @@
-package com.sckw.address.mapper;
-
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.address.entity.KwBusinessAddress;
-import com.sckw.address.entity.vo.req.KwBusinessAddressListParam;
-import com.sckw.address.entity.vo.req.KwBusinessAddressPageListParam;
-import com.sckw.address.entity.vo.res.KwBusinessAddressListRes;
-import com.sckw.address.entity.vo.res.KwBusinessPageListRes;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-@DS("address")
-public interface KwBusinessAddressMapper extends BaseMapper<KwBusinessAddress> {
-
-    List<KwBusinessPageListRes> selectPageList(@Param("selectPageParam") KwBusinessAddressPageListParam kwBusinessAddressListParam);
-
-    List<KwBusinessAddressListRes> list(@Param("param") KwBusinessAddressListParam param);
-}
+package com.sckw.address.mapper;
+
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.address.entity.KwBusinessAddress;
+import com.sckw.address.entity.vo.req.KwBusinessAddressListParam;
+import com.sckw.address.entity.vo.req.KwBusinessAddressPageListParam;
+import com.sckw.address.entity.vo.res.KwBusinessAddressListRes;
+import com.sckw.address.entity.vo.res.KwBusinessPageListRes;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+@DS("address")
+public interface KwBusinessAddressMapper extends BaseMapper<KwBusinessAddress> {
+
+    List<KwBusinessPageListRes> selectPageList(@Param("selectPageParam") KwBusinessAddressPageListParam kwBusinessAddressListParam);
+
+    List<KwBusinessAddressListRes> list(@Param("param") KwBusinessAddressListParam param);
+}

business-modules/business-address/src/main/java/com/sckw/address/mapper/KwBusinessAddressTypeMapper.java

@@ -1,17 +1,17 @@
-package com.sckw.address.mapper;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.address.entity.KwBusinessAddressType;
-import com.sckw.address.entity.vo.res.KwBusinessAddressTypeListRes;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-@DS("address")
-public interface KwBusinessAddressTypeMapper extends BaseMapper<KwBusinessAddressType> {
-
-    List<KwBusinessAddressTypeListRes> list(@Param("name") String name);
-}
+package com.sckw.address.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.address.entity.KwBusinessAddressType;
+import com.sckw.address.entity.vo.res.KwBusinessAddressTypeListRes;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+@DS("address")
+public interface KwBusinessAddressTypeMapper extends BaseMapper<KwBusinessAddressType> {
+
+    List<KwBusinessAddressTypeListRes> list(@Param("name") String name);
+}

business-modules/business-address/src/main/java/com/sckw/address/service/KwAddressService.java

@@ -1,177 +1,177 @@
-package com.sckw.address.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.sckw.address.entity.KwBusinessAddress;
-import com.sckw.address.entity.vo.req.KwBusinessAddressListParam;
-import com.sckw.address.entity.vo.req.KwBusinessAddressPageListParam;
-import com.sckw.address.entity.vo.req.KwBusinessAddressParam;
-import com.sckw.address.entity.vo.res.KwBusinessAddressListRes;
-import com.sckw.address.entity.vo.res.KwBusinessAddressTypeListRes;
-import com.sckw.address.entity.vo.res.KwBusinessPageListRes;
-import com.sckw.address.mapper.KwBusinessAddressMapper;
-import com.sckw.core.model.constant.Global;
-import com.sckw.core.model.page.PageRes;
-import com.sckw.core.utils.BeanUtils;
-import com.sckw.core.utils.CollectionUtils;
-import com.sckw.core.web.response.HttpResult;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-04-11
- */
-@Service
-public class KwAddressService {
-
-    @Autowired
-    KwBusinessAddressMapper kwBusinessAddressMapper;
-
-    @Autowired
-    KwBusinessAddressTypeService kwBusinessAddressTypeService;
-
-    /**
-    * @Description: 订单新增
-    * @Author: Lt
-    * @Date: 2024/4/11 16:02
-    */
-    public HttpResult addressCreate(KwBusinessAddressParam kwBusinessAddressParam)
-    {
-        KwBusinessAddress kwBusinessAddress = BeanUtils.copyProperties(kwBusinessAddressParam, KwBusinessAddress.class);
-        KwBusinessAddress name = kwBusinessAddressMapper.
-                selectOne(new QueryWrapper<KwBusinessAddress>().eq("name", kwBusinessAddress.getName()));
-        if(ObjectUtils.isNotEmpty(name)){
-            return HttpResult.error("名称重复");
-        }
-        kwBusinessAddressMapper.insert(kwBusinessAddress);
-        return HttpResult.ok("保存成功");
-    }
-
-    /**
-    * @Description: 地址编辑
-    * @Author: Lt
-    * @Date: 2024/4/11 16:08
-    */
-    public HttpResult addressUpdate(KwBusinessAddressParam kwBusinessAddressParam)
-    {
-
-        if(kwBusinessAddressParam.getId() == null) {
-            return HttpResult.error("缺少参数:ID");
-        }
-
-        KwBusinessAddress kwBusinessAddressTypeExists = kwBusinessAddressMapper.selectOne(
-                new LambdaQueryWrapper<KwBusinessAddress>()
-                        .eq(KwBusinessAddress::getName, kwBusinessAddressParam.getName())
-                        .ne(KwBusinessAddress::getId, kwBusinessAddressParam.getId())
-                        .eq(KwBusinessAddress::getDelFlag, Global.NUMERICAL_ZERO));
-        if (ObjectUtils.isNotNull(kwBusinessAddressTypeExists)) {
-            return HttpResult.error("地址名称已存在");
-        }
-
-
-        KwBusinessAddress oldKwBusinessAddress = kwBusinessAddressMapper.selectOne(new QueryWrapper<KwBusinessAddress>()
-                .eq("id",kwBusinessAddressParam.getId()));
-        
-        if(oldKwBusinessAddress!=null){
-            KwBusinessAddress kwBusinessAddress = BeanUtils.copyProperties(kwBusinessAddressParam, KwBusinessAddress.class);
-            kwBusinessAddressMapper.updateById(kwBusinessAddress);
-            return HttpResult.ok("编辑成功");
-        }
-        return HttpResult.error("编辑失败");
-    }
-
-    /**
-    * @Description: 地址删除
-    * @Author: Lt
-    * @Date: 2024/4/11 16:35
-    */
-    public HttpResult addressDelete(String id)
-    {
-        KwBusinessAddress kwBusinessAddress = kwBusinessAddressMapper.selectOne(new QueryWrapper<KwBusinessAddress>().eq("id",id).eq("del_flag",Global.NUMERICAL_ZERO));
-        if(kwBusinessAddress!=null){
-            kwBusinessAddress.setId(Long.valueOf(id));
-            kwBusinessAddress.setDelFlag(Global.NUMERICAL_ONE);
-            kwBusinessAddressMapper.updateById(kwBusinessAddress);
-            return HttpResult.ok("删除成功");
-        }else{
-            return HttpResult.error("没有找到该对象");
-        }
-    }
-
-    /**
-    * @Description: 地址Find查询
-    * @Author: Lt
-    * @Date: 2024/4/11 0011 16:39
-    */
-    public HttpResult addressFind(String id)
-    {
-        LambdaQueryWrapper<KwBusinessAddress> addressLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        addressLambdaQueryWrapper.eq(KwBusinessAddress::getId, id).eq(KwBusinessAddress::getDelFlag,Global.NUMERICAL_ZERO);
-        KwBusinessAddress kwBusinessAddress = kwBusinessAddressMapper.selectOne(addressLambdaQueryWrapper);
-        if(kwBusinessAddress!=null){
-            return HttpResult.ok(kwBusinessAddress);
-        }else{
-            return HttpResult.error("没有找到该对象");
-        }
-
-    }
-
-    /**
-    * @Description: 地址分页查询
-    * @Author: Lt
-    * @Date: 2024/4/11 16:46
-    */
-    public HttpResult addressPageList(KwBusinessAddressPageListParam kwBusinessAddressListParam)
-    {
-        PageHelper.startPage(kwBusinessAddressListParam.getPage(), kwBusinessAddressListParam.getPageSize());
-        List<KwBusinessPageListRes> kwBusinessPageListRes = kwBusinessAddressMapper.selectPageList(kwBusinessAddressListParam);
-        HashMap<Long, String> objectObjectHashMap = new HashMap<>();
-        if(CollectionUtils.isNotEmpty(kwBusinessPageListRes)) {
-            List<KwBusinessAddressTypeListRes> kwBusinessAddressTypeListRes = kwBusinessAddressTypeService.selectList(null);
-            kwBusinessAddressTypeListRes.forEach(l -> {
-                objectObjectHashMap.put(l.getId(), l.getName());
-            });
-        }
-
-        kwBusinessPageListRes.forEach(e -> {
-            String typeStr = objectObjectHashMap.get(e.getType());
-            if (typeStr != null) {
-                e.setTypeStr(typeStr);
-            }
-        });
-        return HttpResult.ok(new PageRes<>(new PageInfo<>(kwBusinessPageListRes)));
-    }
-
-    /**
-    * @Description: 地址查询
-    * @Author: Lt
-    * @Date: 2024/4/11 0011 17:09
-    */
-    public PageRes<KwBusinessAddressListRes> selectList(KwBusinessAddressListParam param)
-    {
-
-        List<KwBusinessAddressListRes> resultList;
-
-        // 判断是否需要分页
-        if (param.getPage() != null && param.getPageSize() != null) {
-            // 分页查询
-            PageHelper.startPage(param.getPage(), param.getPageSize());
-            resultList = kwBusinessAddressMapper.list(param);
-            return new PageRes<>(new PageInfo<>(resultList)); // 注意这里应该返回resultList而不是kwBusinessGoods
-        } else {
-            // 不分页查询
-            resultList = kwBusinessAddressMapper.list(param);
-            // 直接返回结果列表，不包装PageInfo，除非你有其他非分页的PageRes构造方式
-            return new PageRes<>(resultList); // 假设PageRes有合适的构造方法处理非分页情况
-        }
-    }
-
-
-}
+package com.sckw.address.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.sckw.address.entity.KwBusinessAddress;
+import com.sckw.address.entity.vo.req.KwBusinessAddressListParam;
+import com.sckw.address.entity.vo.req.KwBusinessAddressPageListParam;
+import com.sckw.address.entity.vo.req.KwBusinessAddressParam;
+import com.sckw.address.entity.vo.res.KwBusinessAddressListRes;
+import com.sckw.address.entity.vo.res.KwBusinessAddressTypeListRes;
+import com.sckw.address.entity.vo.res.KwBusinessPageListRes;
+import com.sckw.address.mapper.KwBusinessAddressMapper;
+import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.page.PageRes;
+import com.sckw.core.utils.BeanUtils;
+import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.web.response.HttpResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-04-11
+ */
+@Service
+public class KwAddressService {
+
+    @Autowired
+    KwBusinessAddressMapper kwBusinessAddressMapper;
+
+    @Autowired
+    KwBusinessAddressTypeService kwBusinessAddressTypeService;
+
+    /**
+    * @Description: 订单新增
+    * @Author: Lt
+    * @Date: 2024/4/11 16:02
+    */
+    public HttpResult addressCreate(KwBusinessAddressParam kwBusinessAddressParam)
+    {
+        KwBusinessAddress kwBusinessAddress = BeanUtils.copyProperties(kwBusinessAddressParam, KwBusinessAddress.class);
+        KwBusinessAddress name = kwBusinessAddressMapper.
+                selectOne(new QueryWrapper<KwBusinessAddress>().eq("name", kwBusinessAddress.getName()));
+        if(ObjectUtils.isNotEmpty(name)){
+            return HttpResult.error("名称重复");
+        }
+        kwBusinessAddressMapper.insert(kwBusinessAddress);
+        return HttpResult.ok("保存成功");
+    }
+
+    /**
+    * @Description: 地址编辑
+    * @Author: Lt
+    * @Date: 2024/4/11 16:08
+    */
+    public HttpResult addressUpdate(KwBusinessAddressParam kwBusinessAddressParam)
+    {
+
+        if(kwBusinessAddressParam.getId() == null) {
+            return HttpResult.error("缺少参数:ID");
+        }
+
+        KwBusinessAddress kwBusinessAddressTypeExists = kwBusinessAddressMapper.selectOne(
+                new LambdaQueryWrapper<KwBusinessAddress>()
+                        .eq(KwBusinessAddress::getName, kwBusinessAddressParam.getName())
+                        .ne(KwBusinessAddress::getId, kwBusinessAddressParam.getId())
+                        .eq(KwBusinessAddress::getDelFlag, Global.NUMERICAL_ZERO));
+        if (ObjectUtils.isNotNull(kwBusinessAddressTypeExists)) {
+            return HttpResult.error("地址名称已存在");
+        }
+
+
+        KwBusinessAddress oldKwBusinessAddress = kwBusinessAddressMapper.selectOne(new QueryWrapper<KwBusinessAddress>()
+                .eq("id",kwBusinessAddressParam.getId()));
+        
+        if(oldKwBusinessAddress!=null){
+            KwBusinessAddress kwBusinessAddress = BeanUtils.copyProperties(kwBusinessAddressParam, KwBusinessAddress.class);
+            kwBusinessAddressMapper.updateById(kwBusinessAddress);
+            return HttpResult.ok("编辑成功");
+        }
+        return HttpResult.error("编辑失败");
+    }
+
+    /**
+    * @Description: 地址删除
+    * @Author: Lt
+    * @Date: 2024/4/11 16:35
+    */
+    public HttpResult addressDelete(String id)
+    {
+        KwBusinessAddress kwBusinessAddress = kwBusinessAddressMapper.selectOne(new QueryWrapper<KwBusinessAddress>().eq("id",id).eq("del_flag",Global.NUMERICAL_ZERO));
+        if(kwBusinessAddress!=null){
+            kwBusinessAddress.setId(Long.valueOf(id));
+            kwBusinessAddress.setDelFlag(Global.NUMERICAL_ONE);
+            kwBusinessAddressMapper.updateById(kwBusinessAddress);
+            return HttpResult.ok("删除成功");
+        }else{
+            return HttpResult.error("没有找到该对象");
+        }
+    }
+
+    /**
+    * @Description: 地址Find查询
+    * @Author: Lt
+    * @Date: 2024/4/11 0011 16:39
+    */
+    public HttpResult addressFind(String id)
+    {
+        LambdaQueryWrapper<KwBusinessAddress> addressLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        addressLambdaQueryWrapper.eq(KwBusinessAddress::getId, id).eq(KwBusinessAddress::getDelFlag,Global.NUMERICAL_ZERO);
+        KwBusinessAddress kwBusinessAddress = kwBusinessAddressMapper.selectOne(addressLambdaQueryWrapper);
+        if(kwBusinessAddress!=null){
+            return HttpResult.ok(kwBusinessAddress);
+        }else{
+            return HttpResult.error("没有找到该对象");
+        }
+
+    }
+
+    /**
+    * @Description: 地址分页查询
+    * @Author: Lt
+    * @Date: 2024/4/11 16:46
+    */
+    public HttpResult addressPageList(KwBusinessAddressPageListParam kwBusinessAddressListParam)
+    {
+        PageHelper.startPage(kwBusinessAddressListParam.getPage(), kwBusinessAddressListParam.getPageSize());
+        List<KwBusinessPageListRes> kwBusinessPageListRes = kwBusinessAddressMapper.selectPageList(kwBusinessAddressListParam);
+        HashMap<Long, String> objectObjectHashMap = new HashMap<>();
+        if(CollectionUtils.isNotEmpty(kwBusinessPageListRes)) {
+            List<KwBusinessAddressTypeListRes> kwBusinessAddressTypeListRes = kwBusinessAddressTypeService.selectList(null);
+            kwBusinessAddressTypeListRes.forEach(l -> {
+                objectObjectHashMap.put(l.getId(), l.getName());
+            });
+        }
+
+        kwBusinessPageListRes.forEach(e -> {
+            String typeStr = objectObjectHashMap.get(e.getType());
+            if (typeStr != null) {
+                e.setTypeStr(typeStr);
+            }
+        });
+        return HttpResult.ok(new PageRes<>(new PageInfo<>(kwBusinessPageListRes)));
+    }
+
+    /**
+    * @Description: 地址查询
+    * @Author: Lt
+    * @Date: 2024/4/11 0011 17:09
+    */
+    public PageRes<KwBusinessAddressListRes> selectList(KwBusinessAddressListParam param)
+    {
+
+        List<KwBusinessAddressListRes> resultList;
+
+        // 判断是否需要分页
+        if (param.getPage() != null && param.getPageSize() != null) {
+            // 分页查询
+            PageHelper.startPage(param.getPage(), param.getPageSize());
+            resultList = kwBusinessAddressMapper.list(param);
+            return new PageRes<>(new PageInfo<>(resultList)); // 注意这里应该返回resultList而不是kwBusinessGoods
+        } else {
+            // 不分页查询
+            resultList = kwBusinessAddressMapper.list(param);
+            // 直接返回结果列表，不包装PageInfo，除非你有其他非分页的PageRes构造方式
+            return new PageRes<>(resultList); // 假设PageRes有合适的构造方法处理非分页情况
+        }
+    }
+
+
+}

business-modules/business-address/src/main/java/com/sckw/address/service/KwBusinessAddressTypeService.java

@@ -1,112 +1,112 @@
-package com.sckw.address.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.sckw.address.entity.KwBusinessAddressType;
-import com.sckw.address.entity.vo.req.KwBusinessAddressTypeInsertParam;
-import com.sckw.address.entity.vo.res.KwBusinessAddressTypeListRes;
-import com.sckw.address.mapper.KwBusinessAddressTypeMapper;
-import com.sckw.core.model.constant.Global;
-import com.sckw.core.utils.BeanUtils;
-import com.sckw.core.web.response.HttpResult;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import java.util.List;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-04-12
- */
-@Service
-public class KwBusinessAddressTypeService {
-    @Autowired
-    KwBusinessAddressTypeMapper kwBusinessAddressTypeMapper;
-
-    /**
-    * @Description: 地址类型新增
-    * @Author: Lt
-    * @Date: 2024/4/12 9:09
-    */
-    public HttpResult addressTypeInsert(KwBusinessAddressTypeInsertParam kwBusinessAddressTypeInsertParam)
-    {
-
-        LambdaQueryWrapper<KwBusinessAddressType> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(KwBusinessAddressType::getName, kwBusinessAddressTypeInsertParam.getName())
-                .eq(KwBusinessAddressType::getDelFlag, Global.NUMERICAL_ZERO);
-        KwBusinessAddressType addressTypeExists = kwBusinessAddressTypeMapper.selectOne(queryWrapper);
-        if (ObjectUtils.isNotNull(addressTypeExists)) {
-            return HttpResult.error("名称已存在");
-        }
-        KwBusinessAddressType kwBusinessAddressType = BeanUtils.copyProperties(kwBusinessAddressTypeInsertParam, KwBusinessAddressType.class);
-        int insert = kwBusinessAddressTypeMapper.insert(kwBusinessAddressType);
-        if (insert > 0) {
-            return HttpResult.ok("地址添加成功");
-        }
-        return HttpResult.error("地址添加失败");
-    }
-
-
-    /**
-     * @Description: 地址类型编辑
-     * @Author: Lt
-     * @Date: 2024/4/11 16:08
-     */
-    public HttpResult addressTypeUpdate(KwBusinessAddressTypeInsertParam kwBusinessAddressTypeInsertParam)
-    {
-
-        if(kwBusinessAddressTypeInsertParam.getId() == null) {
-            return HttpResult.error("缺少参数:ID");
-        }
-
-        KwBusinessAddressType kwBusinessAddressTypeExists = kwBusinessAddressTypeMapper.selectOne(
-                new LambdaQueryWrapper<KwBusinessAddressType>()
-                        .eq(KwBusinessAddressType::getName, kwBusinessAddressTypeInsertParam.getName())
-                        .ne(KwBusinessAddressType::getId, kwBusinessAddressTypeInsertParam.getId())
-                        .eq(KwBusinessAddressType::getDelFlag, Global.NUMERICAL_ZERO));
-        if (ObjectUtils.isNotNull(kwBusinessAddressTypeExists)) {
-            return HttpResult.error("地址类型名称已存在");
-        }
-
-        KwBusinessAddressType oldKwBusinessAddress = kwBusinessAddressTypeMapper.selectOne(new QueryWrapper<KwBusinessAddressType>()
-                .eq("id",kwBusinessAddressTypeInsertParam.getId()));
-
-        if(oldKwBusinessAddress!=null){
-            KwBusinessAddressType kwBusinessAddressType = BeanUtils.copyProperties(kwBusinessAddressTypeInsertParam, KwBusinessAddressType.class);
-            kwBusinessAddressTypeMapper.updateById(kwBusinessAddressType);
-            return HttpResult.ok("编辑成功");
-        }
-        return HttpResult.error("编辑失败");
-    }
-
-    /**
-     * @Description: 地址查询
-     * @Author: Lt
-     * @Date: 2024/4/11 0011 17:09
-     */
-    public List<KwBusinessAddressTypeListRes> selectList(String name)
-    {
-        return kwBusinessAddressTypeMapper.list(name);
-    }
-    
-    /**
-    * @Description: 地址删除
-    * @Author: Lt
-    * @Date: 2024/4/12 0012 9:23
-    */
-    public HttpResult addressTypeDelete(String id)
-    {
-        KwBusinessAddressType kwBusinessAddress = kwBusinessAddressTypeMapper.selectOne(new QueryWrapper<KwBusinessAddressType>().eq("id",id).eq("del_flag",Global.NUMERICAL_ZERO));
-        if(kwBusinessAddress!=null){
-            kwBusinessAddress.setId(Long.valueOf(id));
-            kwBusinessAddress.setDelFlag(Global.NUMERICAL_ONE);
-            kwBusinessAddressTypeMapper.updateById(kwBusinessAddress);
-            return HttpResult.ok("删除成功");
-        }else{
-            return HttpResult.error("没有找到该对象");
-        }
-    }
-
-
-}
+package com.sckw.address.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.sckw.address.entity.KwBusinessAddressType;
+import com.sckw.address.entity.vo.req.KwBusinessAddressTypeInsertParam;
+import com.sckw.address.entity.vo.res.KwBusinessAddressTypeListRes;
+import com.sckw.address.mapper.KwBusinessAddressTypeMapper;
+import com.sckw.core.model.constant.Global;
+import com.sckw.core.utils.BeanUtils;
+import com.sckw.core.web.response.HttpResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.List;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-04-12
+ */
+@Service
+public class KwBusinessAddressTypeService {
+    @Autowired
+    KwBusinessAddressTypeMapper kwBusinessAddressTypeMapper;
+
+    /**
+    * @Description: 地址类型新增
+    * @Author: Lt
+    * @Date: 2024/4/12 9:09
+    */
+    public HttpResult addressTypeInsert(KwBusinessAddressTypeInsertParam kwBusinessAddressTypeInsertParam)
+    {
+
+        LambdaQueryWrapper<KwBusinessAddressType> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(KwBusinessAddressType::getName, kwBusinessAddressTypeInsertParam.getName())
+                .eq(KwBusinessAddressType::getDelFlag, Global.NUMERICAL_ZERO);
+        KwBusinessAddressType addressTypeExists = kwBusinessAddressTypeMapper.selectOne(queryWrapper);
+        if (ObjectUtils.isNotNull(addressTypeExists)) {
+            return HttpResult.error("名称已存在");
+        }
+        KwBusinessAddressType kwBusinessAddressType = BeanUtils.copyProperties(kwBusinessAddressTypeInsertParam, KwBusinessAddressType.class);
+        int insert = kwBusinessAddressTypeMapper.insert(kwBusinessAddressType);
+        if (insert > 0) {
+            return HttpResult.ok("地址添加成功");
+        }
+        return HttpResult.error("地址添加失败");
+    }
+
+
+    /**
+     * @Description: 地址类型编辑
+     * @Author: Lt
+     * @Date: 2024/4/11 16:08
+     */
+    public HttpResult addressTypeUpdate(KwBusinessAddressTypeInsertParam kwBusinessAddressTypeInsertParam)
+    {
+
+        if(kwBusinessAddressTypeInsertParam.getId() == null) {
+            return HttpResult.error("缺少参数:ID");
+        }
+
+        KwBusinessAddressType kwBusinessAddressTypeExists = kwBusinessAddressTypeMapper.selectOne(
+                new LambdaQueryWrapper<KwBusinessAddressType>()
+                        .eq(KwBusinessAddressType::getName, kwBusinessAddressTypeInsertParam.getName())
+                        .ne(KwBusinessAddressType::getId, kwBusinessAddressTypeInsertParam.getId())
+                        .eq(KwBusinessAddressType::getDelFlag, Global.NUMERICAL_ZERO));
+        if (ObjectUtils.isNotNull(kwBusinessAddressTypeExists)) {
+            return HttpResult.error("地址类型名称已存在");
+        }
+
+        KwBusinessAddressType oldKwBusinessAddress = kwBusinessAddressTypeMapper.selectOne(new QueryWrapper<KwBusinessAddressType>()
+                .eq("id",kwBusinessAddressTypeInsertParam.getId()));
+
+        if(oldKwBusinessAddress!=null){
+            KwBusinessAddressType kwBusinessAddressType = BeanUtils.copyProperties(kwBusinessAddressTypeInsertParam, KwBusinessAddressType.class);
+            kwBusinessAddressTypeMapper.updateById(kwBusinessAddressType);
+            return HttpResult.ok("编辑成功");
+        }
+        return HttpResult.error("编辑失败");
+    }
+
+    /**
+     * @Description: 地址查询
+     * @Author: Lt
+     * @Date: 2024/4/11 0011 17:09
+     */
+    public List<KwBusinessAddressTypeListRes> selectList(String name)
+    {
+        return kwBusinessAddressTypeMapper.list(name);
+    }
+    
+    /**
+    * @Description: 地址删除
+    * @Author: Lt
+    * @Date: 2024/4/12 0012 9:23
+    */
+    public HttpResult addressTypeDelete(String id)
+    {
+        KwBusinessAddressType kwBusinessAddress = kwBusinessAddressTypeMapper.selectOne(new QueryWrapper<KwBusinessAddressType>().eq("id",id).eq("del_flag",Global.NUMERICAL_ZERO));
+        if(kwBusinessAddress!=null){
+            kwBusinessAddress.setId(Long.valueOf(id));
+            kwBusinessAddress.setDelFlag(Global.NUMERICAL_ONE);
+            kwBusinessAddressTypeMapper.updateById(kwBusinessAddress);
+            return HttpResult.ok("删除成功");
+        }else{
+            return HttpResult.error("没有找到该对象");
+        }
+    }
+
+
+}

business-modules/business-address/src/main/resources/mapper/KwBusinessAddressMapper.xml

@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sckw.address.mapper.KwBusinessAddressMapper">
-
-    <sql id="Base_Column_List">
-                id,
-                `name`,
-                own_region,
-                detail,
-                type,
-                city_name,
-                city_code,
-                lat,
-                lng,
-                fence,
-                `status`,
-                create_by,
-                update_by,
-                create_time,
-                update_time,
-                del_flag
-    </sql>
-
-    <select id="selectPageList" resultType="com.sckw.address.entity.vo.res.KwBusinessPageListRes">
-        select <include refid="Base_Column_List" /> from kw_business_address
-        <where>
-            del_flag = 0
-            <if test="selectPageParam.type != null">
-              and type = #{selectPageParam.type,jdbcType=INTEGER}
-            </if>
-            <if test="selectPageParam.name != null and selectPageParam.name != ''">
-                AND `name` LIKE concat('%' , #{selectPageParam.name} , '%')
-            </if>
-        </where>
-    </select>
-
-    <select id="list" resultType="com.sckw.address.entity.vo.res.KwBusinessAddressListRes">
-        select id,name from kw_business_address
-        <where>
-            del_flag = 0
-            <if test="param.name != null and param.name != ''">
-                AND `name` LIKE concat('%' , #{param.name} , '%')
-            </if>
-        </where>
-    </select>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.address.mapper.KwBusinessAddressMapper">
+
+    <sql id="Base_Column_List">
+                id,
+                `name`,
+                own_region,
+                detail,
+                type,
+                city_name,
+                city_code,
+                lat,
+                lng,
+                fence,
+                `status`,
+                create_by,
+                update_by,
+                create_time,
+                update_time,
+                del_flag
+    </sql>
+
+    <select id="selectPageList" resultType="com.sckw.address.entity.vo.res.KwBusinessPageListRes">
+        select <include refid="Base_Column_List" /> from kw_business_address
+        <where>
+            del_flag = 0
+            <if test="selectPageParam.type != null">
+              and type = #{selectPageParam.type,jdbcType=INTEGER}
+            </if>
+            <if test="selectPageParam.name != null and selectPageParam.name != ''">
+                AND `name` LIKE concat('%' , #{selectPageParam.name} , '%')
+            </if>
+        </where>
+    </select>
+
+    <select id="list" resultType="com.sckw.address.entity.vo.res.KwBusinessAddressListRes">
+        select id,name from kw_business_address
+        <where>
+            del_flag = 0
+            <if test="param.name != null and param.name != ''">
+                AND `name` LIKE concat('%' , #{param.name} , '%')
+            </if>
+        </where>
+    </select>
 </mapper>

business-modules/business-address/src/main/resources/mapper/KwBusinessAddressTypeMapper.xml

@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sckw.address.mapper.KwBusinessAddressTypeMapper">
-
-    <select id="selectPageList" resultType="com.sckw.address.entity.vo.res.KwBusinessPageListRes">
-        select * from kw_business_address_type
-        <where>
-            del_flag = 0
-            <if test="selectPageParam.type != null">
-              and type = #{selectPageParam.type,jdbcType=INTEGER}
-            </if>
-            <if test="selectPageParam.name != null and selectPageParam.name != ''">
-                AND `name` LIKE concat('%' , #{selectPageParam.name} , '%')
-            </if>
-        </where>
-    </select>
-
-    <select id="list" resultType="com.sckw.address.entity.vo.res.KwBusinessAddressTypeListRes">
-        select id,name from kw_business_address_type
-        <where>
-            del_flag = 0
-            <if test="name != null and name != ''">
-                AND `name` LIKE concat('%' , #{name} , '%')
-            </if>
-        </where>
-    </select>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.address.mapper.KwBusinessAddressTypeMapper">
+
+    <select id="selectPageList" resultType="com.sckw.address.entity.vo.res.KwBusinessPageListRes">
+        select * from kw_business_address_type
+        <where>
+            del_flag = 0
+            <if test="selectPageParam.type != null">
+              and type = #{selectPageParam.type,jdbcType=INTEGER}
+            </if>
+            <if test="selectPageParam.name != null and selectPageParam.name != ''">
+                AND `name` LIKE concat('%' , #{selectPageParam.name} , '%')
+            </if>
+        </where>
+    </select>
+
+    <select id="list" resultType="com.sckw.address.entity.vo.res.KwBusinessAddressTypeListRes">
+        select id,name from kw_business_address_type
+        <where>
+            del_flag = 0
+            <if test="name != null and name != ''">
+                AND `name` LIKE concat('%' , #{name} , '%')
+            </if>
+        </where>
+    </select>
 </mapper>

business-modules/business-car-transport/src/main/java/com/sckw/car/controller/CarTransportController.java

@@ -1,84 +1,84 @@
-package com.sckw.car.controller;
-
-import com.sckw.car.entity.req.AddLogisticsOrderParam;
-import com.sckw.car.service.CarTransportListService;
-import com.sckw.car.service.CarTransportService;
-import com.sckw.core.web.response.HttpResult;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @desc: 轿运控制器
- * @author: Lt
- * @date: 2024-04-15
- */
-@Validated
-@RestController
-@RequestMapping("/car")
-public class CarTransportController {
-
-    @Autowired
-    CarTransportService carTransportService;
-
-    @Autowired
-    CarTransportListService carTransportListService;
-
-    
-    /**
-    * @Description: 轿运添加
-    * @Author: Lt
-    * @Date: 2024/4/17 11:12
-    */
-    @PostMapping("/addOrder")
-    public HttpResult carTransportAdd(@RequestBody AddLogisticsOrderParam addLogisticsOrderParam)
-    {
-        return HttpResult.ok(carTransportService.carTransportAdd(addLogisticsOrderParam));
-    }
-
-    /**
-    * @Description: 获取清单列表-轿运新增-货物明细-列表筛选
-    * @Author: Lt
-    * @Date: 2024/4/18 9:34
-    */
-    @GetMapping("/listDetail")
-    public HttpResult listDetails(@RequestParam(value = "name", required = false) String name)
-    {
-        return HttpResult.ok(carTransportListService.listDetail(name));
-    }
-
-    /**
-    * @Description: 轿运-详情
-    * @Author: Lt
-    * @Date: 2024/5/8 20:03
-    */
-    @GetMapping("/detail")
-    public HttpResult detail(@RequestParam("orderId") String orderId)
-    {
-        return HttpResult.ok(carTransportListService.detail(orderId));
-    }
-
-    /**
-     * @Description: 轿运-完结
-     * @Author: Lt
-     * @Date: 2024/5/8 20:03
-     */
-    @GetMapping("/completeDetail")
-    public HttpResult completeDetail(@RequestParam("orderId") String orderId)
-    {
-        return HttpResult.ok(carTransportListService.completeDetail(orderId));
-    }
-
-
-    /**
-    * @Description:
-    * @Author: Lt
-    * @Date: 2024/5/12 0012 17:49
-    */
-    @GetMapping("/getStatusCountListInSingleQuery")
-    public HttpResult getStatusCountListInSingleQuery()
-    {
-        return HttpResult.ok(carTransportListService.getStatusCountListInSingleQuery());
-    }
-
-}
+package com.sckw.car.controller;
+
+import com.sckw.car.entity.req.AddLogisticsOrderParam;
+import com.sckw.car.service.CarTransportListService;
+import com.sckw.car.service.CarTransportService;
+import com.sckw.core.web.response.HttpResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @desc: 轿运控制器
+ * @author: Lt
+ * @date: 2024-04-15
+ */
+@Validated
+@RestController
+@RequestMapping("/car")
+public class CarTransportController {
+
+    @Autowired
+    CarTransportService carTransportService;
+
+    @Autowired
+    CarTransportListService carTransportListService;
+
+    
+    /**
+    * @Description: 轿运添加
+    * @Author: Lt
+    * @Date: 2024/4/17 11:12
+    */
+    @PostMapping("/addOrder")
+    public HttpResult carTransportAdd(@RequestBody AddLogisticsOrderParam addLogisticsOrderParam)
+    {
+        return HttpResult.ok(carTransportService.carTransportAdd(addLogisticsOrderParam));
+    }
+
+    /**
+    * @Description: 获取清单列表-轿运新增-货物明细-列表筛选
+    * @Author: Lt
+    * @Date: 2024/4/18 9:34
+    */
+    @GetMapping("/listDetail")
+    public HttpResult listDetails(@RequestParam(value = "name", required = false) String name)
+    {
+        return HttpResult.ok(carTransportListService.listDetail(name));
+    }
+
+    /**
+    * @Description: 轿运-详情
+    * @Author: Lt
+    * @Date: 2024/5/8 20:03
+    */
+    @GetMapping("/detail")
+    public HttpResult detail(@RequestParam("orderId") String orderId)
+    {
+        return HttpResult.ok(carTransportListService.detail(orderId));
+    }
+
+    /**
+     * @Description: 轿运-完结
+     * @Author: Lt
+     * @Date: 2024/5/8 20:03
+     */
+    @GetMapping("/completeDetail")
+    public HttpResult completeDetail(@RequestParam("orderId") String orderId)
+    {
+        return HttpResult.ok(carTransportListService.completeDetail(orderId));
+    }
+
+
+    /**
+    * @Description:
+    * @Author: Lt
+    * @Date: 2024/5/12 0012 17:49
+    */
+    @GetMapping("/getStatusCountListInSingleQuery")
+    public HttpResult getStatusCountListInSingleQuery()
+    {
+        return HttpResult.ok(carTransportListService.getStatusCountListInSingleQuery());
+    }
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/controller/WayBillController.java

@@ -1,70 +1,70 @@
-package com.sckw.car.controller;
-
-import com.sckw.car.entity.req.KwOrderCarCompleteParam;
-import com.sckw.car.entity.req.KwOrderSendCarParam;
-import com.sckw.car.service.KwWayBillService;
-import com.sckw.core.web.response.HttpResult;
-import jakarta.validation.Valid;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @desc: 派车运单控制器
- * @author: Lt
- * @date: 2024-04-18
- */
-@Validated
-@RestController
-@RequestMapping("/car/waybill")
-public class WayBillController {
-
-    @Autowired
-    KwWayBillService kwWayBillService;
-
-    /**
-    * @Description: 轿运-派车
-    * @Author: Lt
-    * @Date: 2024/4/18 15:17
-    */
-    @PostMapping("/sendCar")
-    public HttpResult sendCar(@RequestBody @Valid KwOrderSendCarParam kwOrderSendCarParam)
-    {
-        return kwWayBillService.sendCarInsert(kwOrderSendCarParam);
-    }
-
-    /**
-    * @Description: 轿运-派车草稿
-    * @Author: Lt
-    * @Date: 2024/4/18 15:17
-    */
-    @PostMapping("/sendCarDraft")
-    public HttpResult sendCarDraft(@RequestBody @Valid KwOrderSendCarParam kwOrderSendCarParam)
-    {
-        return kwWayBillService.sendCarDraft(kwOrderSendCarParam);
-    }
-
-    /**
-    * @Description: 完结订单-订单详情
-    * @Author: Lt
-    * @Date: 2024/4/22 10:29
-    */
-    @GetMapping("/waybillDetail")
-    public HttpResult waybillDetail(@RequestParam(value = "orderId", required = false) String orderId)
-    {
-        return HttpResult.ok(kwWayBillService.waybillDetail(orderId));
-    }
-
-    /**
-     * @Description: 轿运-完结订单
-     * @Author: Lt
-     * @Date: 2024/4/18 15:17
-     */
-    @PostMapping("/completeOrder")
-    public HttpResult completeOrder(@RequestBody @Valid KwOrderCarCompleteParam kwOrderCarCompleteParam)
-    {
-        return kwWayBillService.completeOrder(kwOrderCarCompleteParam);
-    }
-
-
-}
+package com.sckw.car.controller;
+
+import com.sckw.car.entity.req.KwOrderCarCompleteParam;
+import com.sckw.car.entity.req.KwOrderSendCarParam;
+import com.sckw.car.service.KwWayBillService;
+import com.sckw.core.web.response.HttpResult;
+import jakarta.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @desc: 派车运单控制器
+ * @author: Lt
+ * @date: 2024-04-18
+ */
+@Validated
+@RestController
+@RequestMapping("/car/waybill")
+public class WayBillController {
+
+    @Autowired
+    KwWayBillService kwWayBillService;
+
+    /**
+    * @Description: 轿运-派车
+    * @Author: Lt
+    * @Date: 2024/4/18 15:17
+    */
+    @PostMapping("/sendCar")
+    public HttpResult sendCar(@RequestBody @Valid KwOrderSendCarParam kwOrderSendCarParam)
+    {
+        return kwWayBillService.sendCarInsert(kwOrderSendCarParam);
+    }
+
+    /**
+    * @Description: 轿运-派车草稿
+    * @Author: Lt
+    * @Date: 2024/4/18 15:17
+    */
+    @PostMapping("/sendCarDraft")
+    public HttpResult sendCarDraft(@RequestBody @Valid KwOrderSendCarParam kwOrderSendCarParam)
+    {
+        return kwWayBillService.sendCarDraft(kwOrderSendCarParam);
+    }
+
+    /**
+    * @Description: 完结订单-订单详情
+    * @Author: Lt
+    * @Date: 2024/4/22 10:29
+    */
+    @GetMapping("/waybillDetail")
+    public HttpResult waybillDetail(@RequestParam(value = "orderId", required = false) String orderId)
+    {
+        return HttpResult.ok(kwWayBillService.waybillDetail(orderId));
+    }
+
+    /**
+     * @Description: 轿运-完结订单
+     * @Author: Lt
+     * @Date: 2024/4/18 15:17
+     */
+    @PostMapping("/completeOrder")
+    public HttpResult completeOrder(@RequestBody @Valid KwOrderCarCompleteParam kwOrderCarCompleteParam)
+    {
+        return kwWayBillService.completeOrder(kwOrderCarCompleteParam);
+    }
+
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/KwCarOrder.java

@@ -1,247 +1,247 @@
-package com.sckw.car.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * @desc: 普通货物-陆运
- * @author: lt
- * @date: 2024/3/28 9:48
- */
-@Getter
-@Setter
-@Accessors(chain = true)
-@TableName(value = "kw_order")
-public class KwCarOrder implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.ASSIGN_ID)
-    private String id;
-
-    private Integer owSystem;
-
-    /*
-    订单来源
-     */
-    private Integer orderSource;
-
-    /**
-     * 物流订单号
-     */
-    private String orderNo;
-
-    /**
-     * 装卸类型
-     */
-    private Integer typeHandling;
-
-    /**
-     * 货物id
-     */
-    private String goodsId;
-
-    /**
-     * 货物名称
-     */
-    private String goodsName;
-
-    /**
-     * 货物类型
-     */
-    private Integer goodsType;
-
-    /**
-     * 货物单位
-     */
-    private String goodsUnit;
-
-    /**
-     * 托运企业id
-     */
-    private String tyCompanyId;
-
-    /**
-     * 托运企业
-     */
-    private String tyCompany;
-
-    /**
-     * 托运联系方式
-     */
-    private String tyPhone;
-
-    /**
-     * 承运企业id
-     */
-    private String cyCompanyId;
-
-    /**
-     * 承运企业
-     */
-    private String cyCompany;
-
-    /**
-     * 承运企业联系方式
-     */
-    private String cyPhone;
-
-    private String fhCompanyId;
-    private String fhCompany;
-    private String fhPhone;
-
-    private String shCompanyId;
-    private String shCompany;
-    private String shPhone;
-
-    /**
-     * 前置订单号
-     */
-    private String pid;
-
-    private String pids;
-
-    private BigDecimal amount;
-
-    private BigDecimal entrustAmount;
-
-    /*
-    分包量（给下游承运商分包的量）
-     */
-    private BigDecimal subcontractAmount;
-
-    /*
-    累计装货量
-     */
-    private BigDecimal totalLoadAmount;
-
-    /*
-    累计卸货量
-     */
-    private BigDecimal totalUnloadAmount;
-
-    private BigDecimal loadAmount;
-
-    private BigDecimal unloadAmount;
-
-    /*
-    忽略剩余量
-     */
-    private BigDecimal ignoreAmount;
-
-    /*
-    单位(吨,方,箱,件)
-     */
-    private String unit;
-    /**
-     * 剩余代运量
-     */
-    private Double remainNum;
-
-    private Double remainAllocation;
-
-    /*
-    结算周期结算周期(周结、月结、季结)
-     */
-    private Long settlementCycle;
-
-    /*
-    运价
-     */
-    private BigDecimal price;
-
-    /*
-    运价方式(元/吨、元/车）
-     */
-    private Long priceType;
-
-    /*
-    计费方式
-     */
-    private String billingMode;
-
-    /*
-    合理损耗单位
-     */
-    private BigDecimal loss;
-
-    /*
-    商品价值（扣亏货值）((实装-实卸)-合理损耗)如果为负数，则为零
-     */
-    private BigDecimal goodsPrice;
-
-    /**
-     * 付款方式(预付款、线下支付、第三方支付）
-     */
-    private Long payment;
-
-    /**
-     * 发票税率（%）
-     */
-    private BigDecimal taxRate;
-
-    /**
-     * 计划开始日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
-    private LocalDateTime startTime;
-
-    /**
-     * 计划结束日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
-    private LocalDateTime endTime;
-
-    /*
-    备注
-     */
-    private String remark;
-
-    /**
-     * 状态
-     */
-    private Integer status;
-
-    /*
-    租户id
-     */
-    private String tenantId;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 修改人
-     */
-    private String updateBy;
-
-    /**
-     * create_time
-     */
-    private Date createTime;
-
-    /**
-     * update_time
-     */
-    private Date updateTime;
-
-    /**
-     * del_flag
-     */
-    private Integer delFlag;
-}
+package com.sckw.car.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * @desc: 普通货物-陆运
+ * @author: lt
+ * @date: 2024/3/28 9:48
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName(value = "kw_order")
+public class KwCarOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    private Integer owSystem;
+
+    /*
+    订单来源
+     */
+    private Integer orderSource;
+
+    /**
+     * 物流订单号
+     */
+    private String orderNo;
+
+    /**
+     * 装卸类型
+     */
+    private Integer typeHandling;
+
+    /**
+     * 货物id
+     */
+    private String goodsId;
+
+    /**
+     * 货物名称
+     */
+    private String goodsName;
+
+    /**
+     * 货物类型
+     */
+    private Integer goodsType;
+
+    /**
+     * 货物单位
+     */
+    private String goodsUnit;
+
+    /**
+     * 托运企业id
+     */
+    private String tyCompanyId;
+
+    /**
+     * 托运企业
+     */
+    private String tyCompany;
+
+    /**
+     * 托运联系方式
+     */
+    private String tyPhone;
+
+    /**
+     * 承运企业id
+     */
+    private String cyCompanyId;
+
+    /**
+     * 承运企业
+     */
+    private String cyCompany;
+
+    /**
+     * 承运企业联系方式
+     */
+    private String cyPhone;
+
+    private String fhCompanyId;
+    private String fhCompany;
+    private String fhPhone;
+
+    private String shCompanyId;
+    private String shCompany;
+    private String shPhone;
+
+    /**
+     * 前置订单号
+     */
+    private String pid;
+
+    private String pids;
+
+    private BigDecimal amount;
+
+    private BigDecimal entrustAmount;
+
+    /*
+    分包量（给下游承运商分包的量）
+     */
+    private BigDecimal subcontractAmount;
+
+    /*
+    累计装货量
+     */
+    private BigDecimal totalLoadAmount;
+
+    /*
+    累计卸货量
+     */
+    private BigDecimal totalUnloadAmount;
+
+    private BigDecimal loadAmount;
+
+    private BigDecimal unloadAmount;
+
+    /*
+    忽略剩余量
+     */
+    private BigDecimal ignoreAmount;
+
+    /*
+    单位(吨,方,箱,件)
+     */
+    private String unit;
+    /**
+     * 剩余代运量
+     */
+    private Double remainNum;
+
+    private Double remainAllocation;
+
+    /*
+    结算周期结算周期(周结、月结、季结)
+     */
+    private Long settlementCycle;
+
+    /*
+    运价
+     */
+    private BigDecimal price;
+
+    /*
+    运价方式(元/吨、元/车）
+     */
+    private Long priceType;
+
+    /*
+    计费方式
+     */
+    private String billingMode;
+
+    /*
+    合理损耗单位
+     */
+    private BigDecimal loss;
+
+    /*
+    商品价值（扣亏货值）((实装-实卸)-合理损耗)如果为负数，则为零
+     */
+    private BigDecimal goodsPrice;
+
+    /**
+     * 付款方式(预付款、线下支付、第三方支付）
+     */
+    private Long payment;
+
+    /**
+     * 发票税率（%）
+     */
+    private BigDecimal taxRate;
+
+    /**
+     * 计划开始日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private LocalDateTime startTime;
+
+    /**
+     * 计划结束日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private LocalDateTime endTime;
+
+    /*
+    备注
+     */
+    private String remark;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /*
+    租户id
+     */
+    private String tenantId;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 修改人
+     */
+    private String updateBy;
+
+    /**
+     * create_time
+     */
+    private Date createTime;
+
+    /**
+     * update_time
+     */
+    private Date updateTime;
+
+    /**
+     * del_flag
+     */
+    private Integer delFlag;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/KwCarOrderDict.java

@@ -1,73 +1,73 @@
-package com.sckw.car.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @desc:
- * @author: lt
- * @date: 2024/4/3 17:37
- */
-@Data
-@TableName("kw_order_dict")
-public class KwCarOrderDict implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 字典名称
-     */
-    private Integer dictSort;
-
-    /**
-     * dict_label
-     */
-    private String dictLabel;
-
-    /**
-     * dict_value
-     */
-    private String dictValue;
-
-    /**
-     * 所属组
-     */
-    private String dictGroup;
-
-    /**
-     * 备注
-     */
-    private String dictRemark;
-
-    /**
-     * status
-     */
-    private Integer status;
-
-    /**
-     * create_time
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * update_time
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * create_by
-     */
-    private String createBy;
-
-    /**
-     * update_by
-     */
-    private String updateBy;
-
-
-
-}
+package com.sckw.car.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @desc:
+ * @author: lt
+ * @date: 2024/4/3 17:37
+ */
+@Data
+@TableName("kw_order_dict")
+public class KwCarOrderDict implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 字典名称
+     */
+    private Integer dictSort;
+
+    /**
+     * dict_label
+     */
+    private String dictLabel;
+
+    /**
+     * dict_value
+     */
+    private String dictValue;
+
+    /**
+     * 所属组
+     */
+    private String dictGroup;
+
+    /**
+     * 备注
+     */
+    private String dictRemark;
+
+    /**
+     * status
+     */
+    private Integer status;
+
+    /**
+     * create_time
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * update_time
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * create_by
+     */
+    private String createBy;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/KwCarWaybillOrder.java

@@ -1,143 +1,143 @@
-package com.sckw.car.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @desc:
- * @author: lt
- * @date: 2024/4/9 15:15
- */
-@Getter
-@Setter
-@TableName("kw_waybill_order")
-public class KwCarWaybillOrder implements Serializable {
-
-    /**
-     * 主键
-     */
-    private String id;
-
-    /**
-     * 企业id
-     */
-    private String entId;
-
-    /*
-    物流订单id
-     */
-    private String orderId;
-
-    /**
-     * 编号
-     */
-    private String tOrderNo;
-
-    /**
-     * 派车类型(1：趟次:2：循环)
-     */
-    private Integer type;
-
-    /**
-     * 车辆档案ID
-     */
-    private String truckId;
-
-    /**
-     * 车牌号
-     */
-    private String truckNo;
-
-    /**
-     * 计划开始时间
-     */
-    private Date startTime;
-
-    /**
-     * 计划结束时间
-     */
-    private Date endTime;
-
-    /**
-     * 司机id
-     */
-    private String driverId;
-
-    /**
-     * 司机姓名
-     */
-    private String driverName;
-
-    /**
-     * 司机手机号
-     */
-    private String driverPhone;
-
-    /**
-     * 司机身份证号码
-     */
-    private String driverIdcard;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 状态（1待接单、2待出车、3已出车、4到达装货点、5已装货、6到达卸货点、7已卸货、8审核通过、9拒接单、10拒出车、11已撤销、12审核不通过）
-     */
-    private Integer status;
-
-    /**
-     * 已委托量
-     */
-    private BigDecimal entrustAmount;
-
-    /**
-     * 卸货重量
-     */
-    private BigDecimal unloadAmount;
-
-    /**
-     * 装货重量
-     */
-    private BigDecimal loadAmount;
-
-    /**
-     * 亏吨重量
-     */
-    private BigDecimal deficitAmount;
-
-    /* 运单来源 1陆运 2轿运 */
-    private Integer tType;
-
-    private Integer unit;
-
-
-    /**
-     * create_time
-     */
-    private Date createTime;
-
-    private String createBy;
-
-    /**
-     * update_by
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 是否删除（0未删除，1删除）
-     */
-    private Integer delFlag;
-}
+package com.sckw.car.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @desc:
+ * @author: lt
+ * @date: 2024/4/9 15:15
+ */
+@Getter
+@Setter
+@TableName("kw_waybill_order")
+public class KwCarWaybillOrder implements Serializable {
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 企业id
+     */
+    private String entId;
+
+    /*
+    物流订单id
+     */
+    private String orderId;
+
+    /**
+     * 编号
+     */
+    private String tOrderNo;
+
+    /**
+     * 派车类型(1：趟次:2：循环)
+     */
+    private Integer type;
+
+    /**
+     * 车辆档案ID
+     */
+    private String truckId;
+
+    /**
+     * 车牌号
+     */
+    private String truckNo;
+
+    /**
+     * 计划开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 计划结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 司机id
+     */
+    private String driverId;
+
+    /**
+     * 司机姓名
+     */
+    private String driverName;
+
+    /**
+     * 司机手机号
+     */
+    private String driverPhone;
+
+    /**
+     * 司机身份证号码
+     */
+    private String driverIdcard;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态（1待接单、2待出车、3已出车、4到达装货点、5已装货、6到达卸货点、7已卸货、8审核通过、9拒接单、10拒出车、11已撤销、12审核不通过）
+     */
+    private Integer status;
+
+    /**
+     * 已委托量
+     */
+    private BigDecimal entrustAmount;
+
+    /**
+     * 卸货重量
+     */
+    private BigDecimal unloadAmount;
+
+    /**
+     * 装货重量
+     */
+    private BigDecimal loadAmount;
+
+    /**
+     * 亏吨重量
+     */
+    private BigDecimal deficitAmount;
+
+    /* 运单来源 1陆运 2轿运 */
+    private Integer tType;
+
+    private Integer unit;
+
+
+    /**
+     * create_time
+     */
+    private Date createTime;
+
+    private String createBy;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 是否删除（0未删除，1删除）
+     */
+    private Integer delFlag;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/KwOrderCarDictReq.java

@@ -1,78 +1,78 @@
-package com.sckw.car.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import jakarta.validation.constraints.NotBlank;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @desc:
- * @author: lt
- * @date: 2024/4/3 17:37
- */
-@Data
-public class KwOrderCarDictReq implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 字典名称
-     */
-    private Integer dictSort;
-
-    /**
-     * dict_label
-     */
-    @NotBlank(message = "字典label必填")
-    private String dictLabel;
-
-    /**
-     * dict_value
-     */
-    @NotBlank(message = "字典value必填")
-    private String dictValue;
-
-    /**
-     * 所属组
-     */
-    @NotBlank(message = "字典所属组必填")
-    private String dictGroup;
-
-    /**
-     * 备注
-     */
-    private String dictRemark;
-
-    /**
-     * status
-     */
-    private Integer status;
-
-    /**
-     * create_time
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
-    private LocalDateTime createTime;
-
-    /**
-     * update_time
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
-    private LocalDateTime updateTime;
-
-    /**
-     * create_by
-     */
-    private String createBy;
-
-    /**
-     * update_by
-     */
-    private String updateBy;
-
-
-
-}
+package com.sckw.car.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @desc:
+ * @author: lt
+ * @date: 2024/4/3 17:37
+ */
+@Data
+public class KwOrderCarDictReq implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 字典名称
+     */
+    private Integer dictSort;
+
+    /**
+     * dict_label
+     */
+    @NotBlank(message = "字典label必填")
+    private String dictLabel;
+
+    /**
+     * dict_value
+     */
+    @NotBlank(message = "字典value必填")
+    private String dictValue;
+
+    /**
+     * 所属组
+     */
+    @NotBlank(message = "字典所属组必填")
+    private String dictGroup;
+
+    /**
+     * 备注
+     */
+    private String dictRemark;
+
+    /**
+     * status
+     */
+    private Integer status;
+
+    /**
+     * create_time
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private LocalDateTime createTime;
+
+    /**
+     * update_time
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private LocalDateTime updateTime;
+
+    /**
+     * create_by
+     */
+    private String createBy;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/KwOrderCarDictRes.java

@@ -1,36 +1,36 @@
-package com.sckw.car.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @desc:
- * @author: lt
- * @date: 2024/4/3 17:37
- */
-@Data
-public class KwOrderCarDictRes implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 字典名称
-     */
-    private String group;
-
-    /**
-     * dict_label
-     */
-    private String label;
-
-    /**
-     * dict_value
-     */
-    private String value;
-
-
-
-
-}
+package com.sckw.car.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @desc:
+ * @author: lt
+ * @date: 2024/4/3 17:37
+ */
+@Data
+public class KwOrderCarDictRes implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 字典名称
+     */
+    private String group;
+
+    /**
+     * dict_label
+     */
+    private String label;
+
+    /**
+     * dict_value
+     */
+    private String value;
+
+
+
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/KwOrderCarLandTransportDefGoods.java

@@ -1,62 +1,62 @@
-package com.sckw.car.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-05-08
- */
-@Data
-public class KwOrderCarLandTransportDefGoods implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private Long id;
-
-    /**
-     * order_id
-     */
-    private Long orderId;
-
-    /**
-     * 合理损耗
-     */
-    private String rationalLoss;
-
-    /**
-     * 扣款单价
-     */
-    private Double dedPrice;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * update_by
-     */
-    private String updateBy;
-
-    /**
-     * create_time
-     */
-    private Date createTime;
-
-    /**
-     * update_time
-     */
-    private Date updateTime;
-
-    /**
-     * del_flag
-     */
-    private Integer delFlag;
-}
+package com.sckw.car.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-08
+ */
+@Data
+public class KwOrderCarLandTransportDefGoods implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * order_id
+     */
+    private Long orderId;
+
+    /**
+     * 合理损耗
+     */
+    private String rationalLoss;
+
+    /**
+     * 扣款单价
+     */
+    private Double dedPrice;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+    /**
+     * create_time
+     */
+    private Date createTime;
+
+    /**
+     * update_time
+     */
+    private Date updateTime;
+
+    /**
+     * del_flag
+     */
+    private Integer delFlag;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/KwOrderCarLandTransportInventory.java

@@ -1,52 +1,52 @@
-package com.sckw.car.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @desc: 清单目录Bean
- * @author: Lt
- * @date: 2024-04-17
- */
-@Data
-public class KwOrderCarLandTransportInventory implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private String id;
-
-    /**
-     * 清单名称
-     */
-    private String name;
-
-    /**
-     * create_by
-     */
-    private String createBy;
-
-    /**
-     * update_by
-     */
-    private String updateBy;
-
-    /**
-     * create_time
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * update_time
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * del_flag
-     */
-    private Integer delFlag;
-}
+package com.sckw.car.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @desc: 清单目录Bean
+ * @author: Lt
+ * @date: 2024-04-17
+ */
+@Data
+public class KwOrderCarLandTransportInventory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 清单名称
+     */
+    private String name;
+
+    /**
+     * create_by
+     */
+    private String createBy;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+    /**
+     * create_time
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * update_time
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * del_flag
+     */
+    private Integer delFlag;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/KwOrderCarLandTransportMore.java

@@ -1,72 +1,72 @@
-package com.sckw.car.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @desc: 更多信息
- * @author: Lt
- * @date: 2024-04-17
- */
-@Data
-public class KwOrderCarLandTransportMore implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private String id;
-
-    /**
-     * order_id
-     */
-    private String orderId;
-
-    /**
-     * 车辆类型
-     */
-    private Integer truckType;
-
-    /**
-     * 车辆类型名称
-     */
-    private String truckTypeStr;
-
-    /**
-     * 预估运费
-     */
-    private Double estimateFreight;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * create_by
-     */
-    private String createBy;
-
-    /**
-     * update_by
-     */
-    private String updateBy;
-
-    /**
-     * create_time
-     */
-    private Date createTime;
-
-    /**
-     * update_time
-     */
-    private Date updateTime;
-
-    /**
-     * del_flag
-     */
-    private Integer delFlag;
-}
+package com.sckw.car.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @desc: 更多信息
+ * @author: Lt
+ * @date: 2024-04-17
+ */
+@Data
+public class KwOrderCarLandTransportMore implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * order_id
+     */
+    private String orderId;
+
+    /**
+     * 车辆类型
+     */
+    private Integer truckType;
+
+    /**
+     * 车辆类型名称
+     */
+    private String truckTypeStr;
+
+    /**
+     * 预估运费
+     */
+    private Double estimateFreight;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * create_by
+     */
+    private String createBy;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+    /**
+     * create_time
+     */
+    private Date createTime;
+
+    /**
+     * update_time
+     */
+    private Date updateTime;
+
+    /**
+     * del_flag
+     */
+    private Integer delFlag;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/KwOrderCarLandTransportPath.java

@@ -1,178 +1,178 @@
-package com.sckw.car.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @desc: 轿运路径信息
- * @author: Lt
- * @date: 2024-04-17
- */
-@Data
-public class KwOrderCarLandTransportPath implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    private String id;
-
-    /**
-     * 物流订单id
-     */
-    private String orderId;
-
-    /**
-     * 地址id
-     */
-    private String pathId;
-
-    /**
-     * 线路名称
-     */
-    private String name;
-
-    /*
-     起始地-id
-    */
-    private String loadAddressId;
-
-    /**
-     * 起始地-地址名称
-     */
-    private String loadName;
-
-    /**
-     * 起始地-所在地区
-     */
-    private Integer loadCityCode;
-
-    /**
-     * 起始地-所属区域名称
-     */
-    private String loadCityName;
-
-    /**
-     * 起始地-详细地址
-     */
-    private String loadDetailAddress;
-
-    /**
-     * 起始地-纬度
-     */
-    private String loadLat;
-
-    /**
-     * 起始地-经度
-     */
-    private String loadLng;
-
-    /*
-     起始地-id
-    */
-    private String unloadAddressId;
-
-    /**
-     * 目的地-地址名称
-     */
-    private String unloadName;
-
-    /**
-     * 目的地-所在地区
-     */
-    private Integer unloadCityCode;
-
-    /**
-     * 目的地-所属区域名称
-     */
-    private String unloadCityName;
-
-    /**
-     * 目的地-详细地址
-     */
-    private String unloadDetailAddress;
-
-    /**
-     * 目的地-纬度
-     */
-    private String unloadLat;
-
-    /**
-     * 目的地-经度
-     */
-    private String unloadLng;
-
-    /**
-     * 运输里程
-     */
-    private BigDecimal transportMileage;
-
-    /**
-     * 运输单价（元/公里）
-     */
-    private BigDecimal transportPrice;
-
-    /**
-     * 运输数量（托运填写量）
-     */
-    private BigDecimal transportAmount;
-
-    /**
-     * 结算货物数量（完结填写量）
-     */
-    private BigDecimal settlementAmount;
-
-    /*
-    计费方式
-     */
-    private String billMode;
-
-    /*
-    计量单位
-     */
-    private Integer unit;
-
-    /*
-    清单id
-     */
-    private String goodsId;
-
-    /**
-     * 状态:0正常/1锁定
-     */
-    private Integer status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 更新人
-     */
-    private String updateBy;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 删除标识(0正常/1删除)
-     */
-    private Integer delFlag;
-}
+package com.sckw.car.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @desc: 轿运路径信息
+ * @author: Lt
+ * @date: 2024-04-17
+ */
+@Data
+public class KwOrderCarLandTransportPath implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 物流订单id
+     */
+    private String orderId;
+
+    /**
+     * 地址id
+     */
+    private String pathId;
+
+    /**
+     * 线路名称
+     */
+    private String name;
+
+    /*
+     起始地-id
+    */
+    private String loadAddressId;
+
+    /**
+     * 起始地-地址名称
+     */
+    private String loadName;
+
+    /**
+     * 起始地-所在地区
+     */
+    private Integer loadCityCode;
+
+    /**
+     * 起始地-所属区域名称
+     */
+    private String loadCityName;
+
+    /**
+     * 起始地-详细地址
+     */
+    private String loadDetailAddress;
+
+    /**
+     * 起始地-纬度
+     */
+    private String loadLat;
+
+    /**
+     * 起始地-经度
+     */
+    private String loadLng;
+
+    /*
+     起始地-id
+    */
+    private String unloadAddressId;
+
+    /**
+     * 目的地-地址名称
+     */
+    private String unloadName;
+
+    /**
+     * 目的地-所在地区
+     */
+    private Integer unloadCityCode;
+
+    /**
+     * 目的地-所属区域名称
+     */
+    private String unloadCityName;
+
+    /**
+     * 目的地-详细地址
+     */
+    private String unloadDetailAddress;
+
+    /**
+     * 目的地-纬度
+     */
+    private String unloadLat;
+
+    /**
+     * 目的地-经度
+     */
+    private String unloadLng;
+
+    /**
+     * 运输里程
+     */
+    private BigDecimal transportMileage;
+
+    /**
+     * 运输单价（元/公里）
+     */
+    private BigDecimal transportPrice;
+
+    /**
+     * 运输数量（托运填写量）
+     */
+    private BigDecimal transportAmount;
+
+    /**
+     * 结算货物数量（完结填写量）
+     */
+    private BigDecimal settlementAmount;
+
+    /*
+    计费方式
+     */
+    private String billMode;
+
+    /*
+    计量单位
+     */
+    private Integer unit;
+
+    /*
+    清单id
+     */
+    private String goodsId;
+
+    /**
+     * 状态:0正常/1锁定
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 删除标识(0正常/1删除)
+     */
+    private Integer delFlag;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/KwOrderCarLandTransportPathGoods.java

@@ -1,66 +1,66 @@
-package com.sckw.car.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-05-08
- */
-@Data
-public class KwOrderCarLandTransportPathGoods implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private Long id;
-
-    /**
-     * car_path_id
-     */
-    private String carPathId;
-
-    /**
-     * goods_id
-     */
-    private String goodsId;
-
-    /**
-     * goods_name
-     */
-    private String goodsName;
-
-    /**
-     * goods_num
-     */
-    private String goodsNum;
-
-    /**
-     * create_by
-     */
-    private String createBy;
-
-    /**
-     * update_by
-     */
-    private String updateBy;
-
-    /**
-     * create_time
-     */
-    private Date createTime;
-
-    /**
-     * update_time
-     */
-    private Date updateTime;
-
-    /**
-     * del_flag
-     */
-    private Integer delFlag;
-}
+package com.sckw.car.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-08
+ */
+@Data
+public class KwOrderCarLandTransportPathGoods implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * car_path_id
+     */
+    private String carPathId;
+
+    /**
+     * goods_id
+     */
+    private String goodsId;
+
+    /**
+     * goods_name
+     */
+    private String goodsName;
+
+    /**
+     * goods_num
+     */
+    private String goodsNum;
+
+    /**
+     * create_by
+     */
+    private String createBy;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+    /**
+     * create_time
+     */
+    private Date createTime;
+
+    /**
+     * update_time
+     */
+    private Date updateTime;
+
+    /**
+     * del_flag
+     */
+    private Integer delFlag;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/KwOrderCarLandTransportPer.java

@@ -1,102 +1,102 @@
-package com.sckw.car.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-05-08
- */
-@Data
-public class KwOrderCarLandTransportPer implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private Long id;
-
-    /**
-     * order_id
-     */
-    private Long orderId;
-
-    /**
-     * 履约计划开始时间
-     */
-    private Date perStartTime;
-
-    /**
-     * 履约计划结束时间
-     */
-    private Date perEndTime;
-
-    /**
-     * 结算周期
-     */
-    private String billingCycle;
-
-    /**
-     * 支付方式
-     */
-    private String payMethod;
-
-    /**
-     * pay_company_id
-     */
-    private Long payCompanyId;
-
-    /**
-     * 付款单位
-     */
-    private String payCompany;
-
-    /**
-     * gathering_company_id
-     */
-    private Long gatheringCompanyId;
-
-    /**
-     * 收款单位
-     */
-    private String gatheringCompany;
-
-    /**
-     * 运输单价
-     */
-    private Double price;
-
-    /**
-     * 计费方式
-     */
-    private Integer billingMode;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 修改人
-     */
-    private String updateBy;
-
-    /**
-     * create_time
-     */
-    private Date createTime;
-
-    /**
-     * update_time
-     */
-    private Date updateTime;
-
-    /**
-     * del_flag
-     */
-    private Integer delFlag;
-}
+package com.sckw.car.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-08
+ */
+@Data
+public class KwOrderCarLandTransportPer implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * order_id
+     */
+    private Long orderId;
+
+    /**
+     * 履约计划开始时间
+     */
+    private Date perStartTime;
+
+    /**
+     * 履约计划结束时间
+     */
+    private Date perEndTime;
+
+    /**
+     * 结算周期
+     */
+    private String billingCycle;
+
+    /**
+     * 支付方式
+     */
+    private String payMethod;
+
+    /**
+     * pay_company_id
+     */
+    private Long payCompanyId;
+
+    /**
+     * 付款单位
+     */
+    private String payCompany;
+
+    /**
+     * gathering_company_id
+     */
+    private Long gatheringCompanyId;
+
+    /**
+     * 收款单位
+     */
+    private String gatheringCompany;
+
+    /**
+     * 运输单价
+     */
+    private Double price;
+
+    /**
+     * 计费方式
+     */
+    private Integer billingMode;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 修改人
+     */
+    private String updateBy;
+
+    /**
+     * create_time
+     */
+    private Date createTime;
+
+    /**
+     * update_time
+     */
+    private Date updateTime;
+
+    /**
+     * del_flag
+     */
+    private Integer delFlag;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/KwOrderCarLandTransportTrack.java

@@ -1,69 +1,69 @@
-package com.sckw.car.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @desc: 订单状态跟踪信息记录
- * @author: lt
- * @date: 2024/4/7 16:47
- */
-@Data
-@TableName("kw_order_usual_land_transport_track")
-public class KwOrderCarLandTransportTrack implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 物流订单id
-     */
-    private Long orderId;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /*
-    操作内容
-     */
-    private String actionNote;
-
-    /**
-     * status
-     */
-    private Integer status;
-
-    /**
-     * create_by
-     */
-    private String createBy;
-
-    /**
-     * create_time
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * update_by
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * 是否删除（0未删除，1删除）
-     */
-    private Integer delFlag;
-}
+package com.sckw.car.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @desc: 订单状态跟踪信息记录
+ * @author: lt
+ * @date: 2024/4/7 16:47
+ */
+@Data
+@TableName("kw_order_usual_land_transport_track")
+public class KwOrderCarLandTransportTrack implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 物流订单id
+     */
+    private Long orderId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /*
+    操作内容
+     */
+    private String actionNote;
+
+    /**
+     * status
+     */
+    private Integer status;
+
+    /**
+     * create_by
+     */
+    private String createBy;
+
+    /**
+     * create_time
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 是否删除（0未删除，1删除）
+     */
+    private Integer delFlag;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/KwOrderCarWaybillOrder.java

@@ -1,61 +1,61 @@
-package com.sckw.car.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @description 轿运-派车运单表
- * @author lt
- * @date 2024-04-18
- */
-@Data
-public class KwOrderCarWaybillOrder implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private String id;
-
-    /**
-     * order_id
-     */
-    private String orderId;
-
-    /**
-     * 运单编号
-     */
-    private String taskNo;
-
-    /**
-     * 运单状态
-     */
-    private Integer status;
-
-    /**
-     * create_by
-     */
-    private String createBy;
-
-    /**
-     * update_by
-     */
-    private String updateBy;
-
-    /**
-     * create_time
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * update_time
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * del_flag
-     */
-    private Integer delFlag;
-}
+package com.sckw.car.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @description 轿运-派车运单表
+ * @author lt
+ * @date 2024-04-18
+ */
+@Data
+public class KwOrderCarWaybillOrder implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * order_id
+     */
+    private String orderId;
+
+    /**
+     * 运单编号
+     */
+    private String taskNo;
+
+    /**
+     * 运单状态
+     */
+    private Integer status;
+
+    /**
+     * create_by
+     */
+    private String createBy;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+    /**
+     * create_time
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * update_time
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * del_flag
+     */
+    private Integer delFlag;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/KwOrderCarWaybillOrderDispatch.java

@@ -1,67 +1,67 @@
-package com.sckw.car.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @desc: 轿运-派车任务表
- * @author: Lt
- * @date: 2024-04-18
- */
-@Data
-public class KwOrderCarWaybillOrderDispatch implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private String id;
-
-    /*
-    运单id
-     */
-    private String waybillId;
-
-    /**
-     * 任务编号
-     */
-    private String dispatchNo;
-
-    /**
-     * 车牌号
-     */
-    private String truckNo;
-
-    /**
-     * 驾驶员姓名
-     */
-    private String driverName;
-
-    /**
-     * create_by
-     */
-    private String createBy;
-
-    /**
-     * update_by
-     */
-    private String updateBy;
-
-    /**
-     * create_time
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * update_time
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * del_flag
-     */
-    private Integer delFlag;
-}
+package com.sckw.car.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @desc: 轿运-派车任务表
+ * @author: Lt
+ * @date: 2024-04-18
+ */
+@Data
+public class KwOrderCarWaybillOrderDispatch implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private String id;
+
+    /*
+    运单id
+     */
+    private String waybillId;
+
+    /**
+     * 任务编号
+     */
+    private String dispatchNo;
+
+    /**
+     * 车牌号
+     */
+    private String truckNo;
+
+    /**
+     * 驾驶员姓名
+     */
+    private String driverName;
+
+    /**
+     * create_by
+     */
+    private String createBy;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+    /**
+     * create_time
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * update_time
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * del_flag
+     */
+    private Integer delFlag;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/KwOrderCarWaybillOrderDispatchAddress.java

@@ -1,87 +1,87 @@
-package com.sckw.car.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @desc: 轿运-派车任务地址信息
- * @author: Lt
- * @date: 2024-04-28
- */
-@Data
-public class KwOrderCarWaybillOrderDispatchAddress implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private Long id;
-
-    /**
-     * 订单id
-     */
-    private String orderId;
-
-    /**
-     * 运单id
-     */
-    private String waybillId;
-
-    /**
-     * 路径名称
-     */
-    private String name;
-
-    /**
-     * 地址id
-     */
-    private Long addressId;
-
-    /**
-     * 计量单位 1台 2件
-     */
-    private Integer unit;
-
-    /**
-     * 装卸数量
-     */
-    private Integer entrustAmount;
-
-    /**
-     * 装卸货类型
-     */
-    private Integer addressType;
-
-    /**
-     * 排序
-     */
-    private Integer sort;
-
-    /**
-     * create_by
-     */
-    private String createBy;
-
-    /**
-     * update_by
-     */
-    private String updateBy;
-
-    /**
-     * create_time
-     */
-    private Date createTime;
-
-    /**
-     * update_time
-     */
-    private Date updateTime;
-
-    /**
-     * del_flag
-     */
-    private Integer delFlag;
-
-}
+package com.sckw.car.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @desc: 轿运-派车任务地址信息
+ * @author: Lt
+ * @date: 2024-04-28
+ */
+@Data
+public class KwOrderCarWaybillOrderDispatchAddress implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 订单id
+     */
+    private String orderId;
+
+    /**
+     * 运单id
+     */
+    private String waybillId;
+
+    /**
+     * 路径名称
+     */
+    private String name;
+
+    /**
+     * 地址id
+     */
+    private Long addressId;
+
+    /**
+     * 计量单位 1台 2件
+     */
+    private Integer unit;
+
+    /**
+     * 装卸数量
+     */
+    private Integer entrustAmount;
+
+    /**
+     * 装卸货类型
+     */
+    private Integer addressType;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * create_by
+     */
+    private String createBy;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+    /**
+     * create_time
+     */
+    private Date createTime;
+
+    /**
+     * update_time
+     */
+    private Date updateTime;
+
+    /**
+     * del_flag
+     */
+    private Integer delFlag;
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/KwOrderCarWaybillOrderDispatchAssign.java

@@ -1,66 +1,66 @@
-package com.sckw.car.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @description 轿运-派车任务-任务分配
- * @author lt
- * @date 2024-04-18
- */
-@Data
-public class KwOrderCarWaybillOrderDispatchAssign implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private String id;
-
-    /**
-     * 运单id
-     */
-    private String waybillId;
-
-    /**
-     * 清单详情表id
-     */
-    private String inventoryDetailId;
-
-    /**
-     * 清单表id
-     */
-    private String inventoryId;
-
-    /**
-     * 清单个体编号
-     */
-    private String inventoryOrderNo;
-
-    /**
-     * create_by
-     */
-    private String createBy;
-
-    /**
-     * update_by
-     */
-    private String updateBy;
-
-    /**
-     * create_time
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * update_time
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * del_flag
-     */
-    private Integer delFlag;
-}
+package com.sckw.car.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @description 轿运-派车任务-任务分配
+ * @author lt
+ * @date 2024-04-18
+ */
+@Data
+public class KwOrderCarWaybillOrderDispatchAssign implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 运单id
+     */
+    private String waybillId;
+
+    /**
+     * 清单详情表id
+     */
+    private String inventoryDetailId;
+
+    /**
+     * 清单表id
+     */
+    private String inventoryId;
+
+    /**
+     * 清单个体编号
+     */
+    private String inventoryOrderNo;
+
+    /**
+     * create_by
+     */
+    private String createBy;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+    /**
+     * create_time
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * update_time
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * del_flag
+     */
+    private Integer delFlag;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/KwOrderCarWaybillTransportPathGoods.java

@@ -1,72 +1,72 @@
-package com.sckw.car.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-05-11
- */
-@Data
-public class KwOrderCarWaybillTransportPathGoods implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private Long id;
-
-    /**
-     * car_path_id
-     */
-    private Long waybillId;
-
-    /**
-     * order_id
-     */
-    private String orderId;
-
-    /**
-     * goods_id
-     */
-    private String goodsId;
-
-    /**
-     * goods_name
-     */
-    private String goodsName;
-
-    /**
-     * goods_num
-     */
-    private String goodsNum;
-
-    /**
-     * create_by
-     */
-    private String createBy;
-
-    /**
-     * update_by
-     */
-    private String updateBy;
-
-    /**
-     * create_time
-     */
-    private Date createTime;
-
-    /**
-     * update_time
-     */
-    private Date updateTime;
-
-    /**
-     * del_flag
-     */
-    private Integer delFlag;
-}
+package com.sckw.car.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-11
+ */
+@Data
+public class KwOrderCarWaybillTransportPathGoods implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * car_path_id
+     */
+    private Long waybillId;
+
+    /**
+     * order_id
+     */
+    private String orderId;
+
+    /**
+     * goods_id
+     */
+    private String goodsId;
+
+    /**
+     * goods_name
+     */
+    private String goodsName;
+
+    /**
+     * goods_num
+     */
+    private String goodsNum;
+
+    /**
+     * create_by
+     */
+    private String createBy;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+    /**
+     * create_time
+     */
+    private Date createTime;
+
+    /**
+     * update_time
+     */
+    private Date updateTime;
+
+    /**
+     * del_flag
+     */
+    private Integer delFlag;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/req/GoodsListDetailDto.java

@@ -1,14 +1,14 @@
-package com.sckw.car.entity.req;
-
-import lombok.Data;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-05-08
- */
-@Data
-public class GoodsListDetailDto {
-
-    private String goodsNum;
-}
+package com.sckw.car.entity.req;
+
+import lombok.Data;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-08
+ */
+@Data
+public class GoodsListDetailDto {
+
+    private String goodsNum;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/req/GoodsListDto.java

@@ -1,18 +1,18 @@
-package com.sckw.car.entity.req;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-05-08
- */
-@Data
-public class GoodsListDto {
-
-    private String goodsId;
-    private String goodsName;
-    private List<GoodsListDetailDto> children;
-}
+package com.sckw.car.entity.req;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-08
+ */
+@Data
+public class GoodsListDto {
+
+    private String goodsId;
+    private String goodsName;
+    private List<GoodsListDetailDto> children;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/req/InventoryNumDto.java

@@ -1,16 +1,16 @@
-package com.sckw.car.entity.req;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-05-11
- */
-@Getter
-@Setter
-public class InventoryNumDto {
-
-    private String goodsNum;
-}
+package com.sckw.car.entity.req;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-11
+ */
+@Getter
+@Setter
+public class InventoryNumDto {
+
+    private String goodsNum;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/req/KwOrderCarCompleteParam.java

@@ -1,30 +1,30 @@
-package com.sckw.car.entity.req;
-
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.Size;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-04-22
- */
-@Data
-public class KwOrderCarCompleteParam {
-
-    /* 订单id */
-    private Long orderId;
-
-    /* 备注 */
-    private String remark;
-
-    /* 路径信息 */
-    @NotEmpty(message = "路径必选")
-    @Size(min = 1, message = "路径任务至少有一个")
-    @Valid
-    private List<KwOrderCompletePathDto> path;
-
-}
+package com.sckw.car.entity.req;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-04-22
+ */
+@Data
+public class KwOrderCarCompleteParam {
+
+    /* 订单id */
+    private Long orderId;
+
+    /* 备注 */
+    private String remark;
+
+    /* 路径信息 */
+    @NotEmpty(message = "路径必选")
+    @Size(min = 1, message = "路径任务至少有一个")
+    @Valid
+    private List<KwOrderCompletePathDto> path;
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/req/KwOrderCarLandTransportDefGoodsReq.java

@@ -1,26 +1,26 @@
-package com.sckw.car.entity.req;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-05-08
- */
-@Data
-public class KwOrderCarLandTransportDefGoodsReq implements Serializable {
-
-
-    /**
-     * 合理损耗
-     */
-    private String rationalLoss;
-
-    /**
-     * 扣款单价
-     */
-    private Double dedPrice;
-
-}
+package com.sckw.car.entity.req;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-08
+ */
+@Data
+public class KwOrderCarLandTransportDefGoodsReq implements Serializable {
+
+
+    /**
+     * 合理损耗
+     */
+    private String rationalLoss;
+
+    /**
+     * 扣款单价
+     */
+    private Double dedPrice;
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/req/KwOrderCarLandTransportMoreReq.java

@@ -1,37 +1,37 @@
-package com.sckw.car.entity.req;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @desc: 更多信息
- * @author: Lt
- * @date: 2024-04-17
- */
-@Data
-public class KwOrderCarLandTransportMoreReq implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 车辆类型
-     */
-    private Integer truckType;
-
-    /**
-     * 车辆类型名称
-     */
-    private String truckTypeStr;
-
-    /**
-     * 预估运费
-     */
-    private Double estimateFreight;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-}
+package com.sckw.car.entity.req;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @desc: 更多信息
+ * @author: Lt
+ * @date: 2024-04-17
+ */
+@Data
+public class KwOrderCarLandTransportMoreReq implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 车辆类型
+     */
+    private Integer truckType;
+
+    /**
+     * 车辆类型名称
+     */
+    private String truckTypeStr;
+
+    /**
+     * 预估运费
+     */
+    private Double estimateFreight;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/req/KwOrderCarLandTransportPathDto.java

@@ -1,150 +1,150 @@
-package com.sckw.car.entity.req;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @desc: 轿运路径信息
- * @author: Lt
- * @date: 2024-04-17
- */
-@Data
-public class KwOrderCarLandTransportPathDto implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 线路id
-     */
-    private String pathId;
-
-    /**
-     * 线路名称
-     */
-    private String name;
-
-    /*
-     起始地-id
-    */
-    private String loadAddressId;
-
-    /**
-     * 起始地-地址名称
-     */
-    private String loadName;
-
-    /**
-     * 起始地-所在地区
-     */
-    private Integer loadCityCode;
-
-    /**
-     * 起始地-所属区域名称
-     */
-    private String loadCityName;
-
-    /**
-     * 起始地-详细地址
-     */
-    private String loadDetailAddress;
-
-    /**
-     * 起始地-纬度
-     */
-    private String loadLat;
-
-    /**
-     * 起始地-经度
-     */
-    private String loadLng;
-
-    /*
-     起始地-id
-    */
-    private String unloadAddressId;
-
-    /**
-     * 目的地-地址名称
-     */
-    private String unloadName;
-
-    /**
-     * 目的地-所在地区
-     */
-    private Integer unloadCityCode;
-
-    /**
-     * 目的地-所属区域名称
-     */
-    private String unloadCityName;
-
-    /**
-     * 目的地-详细地址
-     */
-    private String unloadDetailAddress;
-
-    /**
-     * 目的地-纬度
-     */
-    private String unloadLat;
-
-    /**
-     * 目的地-经度
-     */
-    private String unloadLng;
-
-    /**
-     * 运输里程
-     */
-    private BigDecimal transportMileage;
-
-    /**
-     * 运输单价（元/公里）
-     */
-    private BigDecimal transportPrice;
-
-    /**
-     * 运输数量（托运填写量）
-     */
-    private BigDecimal transportAmount;
-
-    /**
-     * 结算货物数量（完结填写量）
-     */
-    private BigDecimal settlementAmount;
-
-    /*
-    计费方式 货物数*里程价
-     */
-    private String billingMode;
-
-    /*
-    计量单位
-     */
-    private Integer unit;
-
-    /**
-     * 状态:0正常/1锁定
-     */
-    private Integer status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 更新人
-     */
-    private String updateBy;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    private GoodsListDto goodsList;
-
-}
+package com.sckw.car.entity.req;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @desc: 轿运路径信息
+ * @author: Lt
+ * @date: 2024-04-17
+ */
+@Data
+public class KwOrderCarLandTransportPathDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 线路id
+     */
+    private String pathId;
+
+    /**
+     * 线路名称
+     */
+    private String name;
+
+    /*
+     起始地-id
+    */
+    private String loadAddressId;
+
+    /**
+     * 起始地-地址名称
+     */
+    private String loadName;
+
+    /**
+     * 起始地-所在地区
+     */
+    private Integer loadCityCode;
+
+    /**
+     * 起始地-所属区域名称
+     */
+    private String loadCityName;
+
+    /**
+     * 起始地-详细地址
+     */
+    private String loadDetailAddress;
+
+    /**
+     * 起始地-纬度
+     */
+    private String loadLat;
+
+    /**
+     * 起始地-经度
+     */
+    private String loadLng;
+
+    /*
+     起始地-id
+    */
+    private String unloadAddressId;
+
+    /**
+     * 目的地-地址名称
+     */
+    private String unloadName;
+
+    /**
+     * 目的地-所在地区
+     */
+    private Integer unloadCityCode;
+
+    /**
+     * 目的地-所属区域名称
+     */
+    private String unloadCityName;
+
+    /**
+     * 目的地-详细地址
+     */
+    private String unloadDetailAddress;
+
+    /**
+     * 目的地-纬度
+     */
+    private String unloadLat;
+
+    /**
+     * 目的地-经度
+     */
+    private String unloadLng;
+
+    /**
+     * 运输里程
+     */
+    private BigDecimal transportMileage;
+
+    /**
+     * 运输单价（元/公里）
+     */
+    private BigDecimal transportPrice;
+
+    /**
+     * 运输数量（托运填写量）
+     */
+    private BigDecimal transportAmount;
+
+    /**
+     * 结算货物数量（完结填写量）
+     */
+    private BigDecimal settlementAmount;
+
+    /*
+    计费方式 货物数*里程价
+     */
+    private String billingMode;
+
+    /*
+    计量单位
+     */
+    private Integer unit;
+
+    /**
+     * 状态:0正常/1锁定
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    private GoodsListDto goodsList;
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/req/KwOrderCarLandTransportPerParam.java

@@ -1,69 +1,69 @@
-package com.sckw.car.entity.req;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-05-08
- */
-@Data
-public class KwOrderCarLandTransportPerParam implements Serializable {
-
-    /**
-     * 履约计划开始时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
-    private Date perStartTime;
-
-    /**
-     * 履约计划结束时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
-    private Date perEndTime;
-
-    /**
-     * 结算周期
-     */
-    private String billingCycle;
-
-    /**
-     * 支付方式
-     */
-    private String payMethod;
-
-    /**
-     * pay_company_id
-     */
-    private String payCompanyId;
-
-    /**
-     * 付款单位
-     */
-    private String payCompany;
-
-    /**
-     * gathering_company_id
-     */
-    private Long gatheringCompanyId;
-
-    /**
-     * 收款单位
-     */
-    private String gatheringCompany;
-
-    /**
-     * 运输单价
-     */
-    private Double price;
-
-    /**
-     * 计费方式
-     */
-    private Integer billingMode;
-
-}
+package com.sckw.car.entity.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-08
+ */
+@Data
+public class KwOrderCarLandTransportPerParam implements Serializable {
+
+    /**
+     * 履约计划开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private Date perStartTime;
+
+    /**
+     * 履约计划结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private Date perEndTime;
+
+    /**
+     * 结算周期
+     */
+    private String billingCycle;
+
+    /**
+     * 支付方式
+     */
+    private String payMethod;
+
+    /**
+     * pay_company_id
+     */
+    private String payCompanyId;
+
+    /**
+     * 付款单位
+     */
+    private String payCompany;
+
+    /**
+     * gathering_company_id
+     */
+    private Long gatheringCompanyId;
+
+    /**
+     * 收款单位
+     */
+    private String gatheringCompany;
+
+    /**
+     * 运输单价
+     */
+    private Double price;
+
+    /**
+     * 计费方式
+     */
+    private Integer billingMode;
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/req/KwOrderCarWaybillOrderDispatchAddressReq.java

@@ -1,65 +1,65 @@
-package com.sckw.car.entity.req;
-
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @desc: 轿运-派车任务地址信息
- * @author: Lt
- * @date: 2024-04-28
- */
-@Data
-public class KwOrderCarWaybillOrderDispatchAddressReq implements Serializable {
-
-    /**
-     * 订单id
-     */
-    @NotNull(message = "缺少参数: orderId")
-    private Long orderId;
-
-    /**
-     * 运单id
-     */
-    @NotNull(message = "缺少参数: waybillId")
-    private Long waybillId;
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 路径名称
-     */
-    private String name;
-
-    /**
-     * 地址id
-     */
-    private Long addressId;
-
-    /**
-     * 计量单位 1台 2件
-     */
-    private Integer unit;
-
-    /**
-     * 装卸数量
-     */
-    private Integer entrustAmount;
-
-    /**
-     * 装卸货类型
-     */
-    private Integer addressType;
-
-    /**
-     * 排序
-     */
-    private Integer sort;
-
-    /**
-     * create_by
-     */
-    private String createBy;
-
-}
+package com.sckw.car.entity.req;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @desc: 轿运-派车任务地址信息
+ * @author: Lt
+ * @date: 2024-04-28
+ */
+@Data
+public class KwOrderCarWaybillOrderDispatchAddressReq implements Serializable {
+
+    /**
+     * 订单id
+     */
+    @NotNull(message = "缺少参数: orderId")
+    private Long orderId;
+
+    /**
+     * 运单id
+     */
+    @NotNull(message = "缺少参数: waybillId")
+    private Long waybillId;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 路径名称
+     */
+    private String name;
+
+    /**
+     * 地址id
+     */
+    private Long addressId;
+
+    /**
+     * 计量单位 1台 2件
+     */
+    private Integer unit;
+
+    /**
+     * 装卸数量
+     */
+    private Integer entrustAmount;
+
+    /**
+     * 装卸货类型
+     */
+    private Integer addressType;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * create_by
+     */
+    private String createBy;
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/req/KwOrderCarWaybillOrderDispatchAssignReq.java

@@ -1,36 +1,36 @@
-package com.sckw.car.entity.req;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-04-18
- */
-@Data
-public class KwOrderCarWaybillOrderDispatchAssignReq {
-
-    /*
-    清单详情表id
-     */
-    private String goodsId;
-
-
-    /*
-    清单表id
-     */
-    private String goodsName;
-
-
-    /*
-    清单表个体编号
-     */
-    private List<InventoryNumDto> children;
-
-
-
-
-
-}
+package com.sckw.car.entity.req;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-04-18
+ */
+@Data
+public class KwOrderCarWaybillOrderDispatchAssignReq {
+
+    /*
+    清单详情表id
+     */
+    private String goodsId;
+
+
+    /*
+    清单表id
+     */
+    private String goodsName;
+
+
+    /*
+    清单表个体编号
+     */
+    private List<InventoryNumDto> children;
+
+
+
+
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/req/KwOrderCompletePathDto.java

@@ -1,23 +1,23 @@
-package com.sckw.car.entity.req;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-04-22
- */
-@Data
-public class KwOrderCompletePathDto {
-
-    private Long id;
-
-    /* 路径名称 */
-    private String name;
-
-    /* 结算量 */
-    private BigDecimal settleAmount;
-
-}
+package com.sckw.car.entity.req;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-04-22
+ */
+@Data
+public class KwOrderCompletePathDto {
+
+    private Long id;
+
+    /* 路径名称 */
+    private String name;
+
+    /* 结算量 */
+    private BigDecimal settleAmount;
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/req/KwOrderSendCarParam.java

@@ -1,46 +1,46 @@
-package com.sckw.car.entity.req;
-
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @desc: 派车请求实体类
- * @author: Lt
- * @date: 2024-04-18
- */
-@Data
-public class KwOrderSendCarParam {
-
-    /*
-    订单id
-     */
-    @NotNull(message = "订单id不能为空")
-    private String orderId;
-
-    /** 派车状态
-     *
-     */
-    private Integer status;
-
-    /*
-      创建人
-     */
-    private String createBy;
-
-
-    /*
-    派车任务
-     */
-    @NotEmpty(message = "派车任务必选")
-    @Size(min = 1, message = "派车任务至少有一个")
-    @Valid
-    List<kwWaybillOrderReq> dispatch;
-
-
-
-}
+package com.sckw.car.entity.req;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @desc: 派车请求实体类
+ * @author: Lt
+ * @date: 2024-04-18
+ */
+@Data
+public class KwOrderSendCarParam {
+
+    /*
+    订单id
+     */
+    @NotNull(message = "订单id不能为空")
+    private String orderId;
+
+    /** 派车状态
+     *
+     */
+    private Integer status;
+
+    /*
+      创建人
+     */
+    private String createBy;
+
+
+    /*
+    派车任务
+     */
+    @NotEmpty(message = "派车任务必选")
+    @Size(min = 1, message = "派车任务至少有一个")
+    @Valid
+    List<kwWaybillOrderReq> dispatch;
+
+
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/req/UpdateCompleteGoodsListDto.java

@@ -1,18 +1,18 @@
-package com.sckw.car.entity.req;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-05-08
- */
-@Data
-public class UpdateCompleteGoodsListDto {
-
-    private String goodsId;
-    private String goodsName;
-    private List<GoodsListDetailDto> children;
-}
+package com.sckw.car.entity.req;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-08
+ */
+@Data
+public class UpdateCompleteGoodsListDto {
+
+    private String goodsId;
+    private String goodsName;
+    private List<GoodsListDetailDto> children;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/req/kwWaybillOrderReq.java

@@ -1,59 +1,59 @@
-package com.sckw.car.entity.req;
-
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * @desc: 派车任务请求类
- * @author: Lt
- * @date: 2024-04-18
- */
-@Data
-@Accessors(chain = true)
-public class kwWaybillOrderReq {
-
-    /* 车辆id */
-    private String truckId;
-
-    /*
-      车牌号
-     */
-    @NotBlank(message = "车牌号不能为空")
-    private String truckNo;
-
-    /* 司机id */
-
-    /*
-      司机姓名
-     */
-    private String driverId;
-    @NotBlank(message = "司机姓名不能是空")
-    private String driverName;
-    private String driverPhone;
-    private String driverIdcard;
-
-    /* 运单来源 */
-    private Integer tType;
-
-    /* 运单备注 */
-    private String remark;
-
-    /*
-     派车人分配任务
-     */
-    //@NotEmpty(message = "请选择任务清单")
-    @Size(min = 1, message = "任务清单至少需要一个元素")
-    @Valid
-    List<KwOrderCarWaybillOrderDispatchAssignReq> goodsList;
-
-    /*
-     派车地址
-    */
-    List<KwOrderCarWaybillOrderDispatchAddressReq> pathAddress;
-
-}
+package com.sckw.car.entity.req;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @desc: 派车任务请求类
+ * @author: Lt
+ * @date: 2024-04-18
+ */
+@Data
+@Accessors(chain = true)
+public class kwWaybillOrderReq {
+
+    /* 车辆id */
+    private String truckId;
+
+    /*
+      车牌号
+     */
+    @NotBlank(message = "车牌号不能为空")
+    private String truckNo;
+
+    /* 司机id */
+
+    /*
+      司机姓名
+     */
+    private String driverId;
+    @NotBlank(message = "司机姓名不能是空")
+    private String driverName;
+    private String driverPhone;
+    private String driverIdcard;
+
+    /* 运单来源 */
+    private Integer tType;
+
+    /* 运单备注 */
+    private String remark;
+
+    /*
+     派车人分配任务
+     */
+    //@NotEmpty(message = "请选择任务清单")
+    @Size(min = 1, message = "任务清单至少需要一个元素")
+    @Valid
+    List<KwOrderCarWaybillOrderDispatchAssignReq> goodsList;
+
+    /*
+     派车地址
+    */
+    List<KwOrderCarWaybillOrderDispatchAddressReq> pathAddress;
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/res/CarDetailRes.java

@@ -1,92 +1,92 @@
-package com.sckw.car.entity.res;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-05-08
- */
-@Data
-public class CarDetailRes {
-    //======================header=========================
-    private String id;
-    private Integer orderSource;      //订单来源
-    private String orderNo;           //订单编号
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime createTime; //创建时间
-    private String createBy;          //创建人
-    private Integer status;           //订单状态
-    private String statusStr;         //订单中文
-    private String qzOrder;           //前置订单号
-    private Integer typeHandling;     //装卸类型
-    private String typeHandlingStr;     //装卸类型中文
-    private String tenantId;     //租户id
-
-    //=====================企业信息=========================
-    private String tyCompanyId;       //托运企业id
-    private String tyCompany;         //托运企业
-    private String tyPhone;           //托运企业联系方式
-
-    private String cyCompanyId;       //承运企业id
-    private String cyCompany;         //承运企业
-    private String cyPhone;           //承运企业联系方式
-
-    private String fhCompanyId;       //发货企业id
-    private String fhCompany;         //发货企业
-    private String fhPhone;           //发货企业联系方式
-
-    private String shCompanyId;       //收货企业id
-    private String shCompany;         //收货企业
-    private String shPhone;           //收货企业联系方式
-
-    //=====================货物信息========================
-    private String goodsId;   //货物id
-    private String goodsName; //货物名称
-    private Integer goodsType; //货物类型
-    private String goodsTypeStr; //货物类型
-    private Integer goodsUnit; //计量单位
-    private String goodsUnitStr; //计量单位
-    private Double goodsNum;  //货物数量
-    private Double goodsVolume;  //货物体积
-    private Double goodsWeight;  //货物重量
-
-    //=====================更多信息========================
-    private Integer truckType;  //车辆类型
-    private String  truckTypeStr;  //车辆类型
-    private BigDecimal  estimateFreight;  //预估运费
-
-    //=====================路径信息========================
-    private List<KwOrderCarLandTransportPathRes> pathList; //路径信息
-
-    //=====================履约信息========================
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
-    private LocalDateTime perStartTime;   //履约开始时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
-    private LocalDateTime perEndTime;     //履约结束时间
-    private String settlementCycle;          //结算周期
-    private String settlementCycleStr;          //结算周期
-    private String payment;             //支付方式
-    private String paymentStr;             //支付方式
-    private String payCompany;            //付款企业
-    private Integer billingMode;            //计费方式
-    private String billingModeStr;            //计费方式Str
-    private BigDecimal price;            //计费方式Str
-    private String gatheringCompany;    //收款单位
-    private String remark;
-
-    //履约记录
-    private BigDecimal remainNum;         //剩余待运量
-    private BigDecimal remainAllocation;  //剩余待分配量
-    private BigDecimal totalLoadAmount;   //累计装货量
-    private BigDecimal totalUnLoadAmount; //累计卸货量
-
-    //====================扣亏货==========================
-    private String rationalLoss;          //合理损耗
-    private BigDecimal dedPrice;          //扣款单价
-}
+package com.sckw.car.entity.res;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-08
+ */
+@Data
+public class CarDetailRes {
+    //======================header=========================
+    private String id;
+    private Integer orderSource;      //订单来源
+    private String orderNo;           //订单编号
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime; //创建时间
+    private String createBy;          //创建人
+    private Integer status;           //订单状态
+    private String statusStr;         //订单中文
+    private String qzOrder;           //前置订单号
+    private Integer typeHandling;     //装卸类型
+    private String typeHandlingStr;     //装卸类型中文
+    private String tenantId;     //租户id
+
+    //=====================企业信息=========================
+    private String tyCompanyId;       //托运企业id
+    private String tyCompany;         //托运企业
+    private String tyPhone;           //托运企业联系方式
+
+    private String cyCompanyId;       //承运企业id
+    private String cyCompany;         //承运企业
+    private String cyPhone;           //承运企业联系方式
+
+    private String fhCompanyId;       //发货企业id
+    private String fhCompany;         //发货企业
+    private String fhPhone;           //发货企业联系方式
+
+    private String shCompanyId;       //收货企业id
+    private String shCompany;         //收货企业
+    private String shPhone;           //收货企业联系方式
+
+    //=====================货物信息========================
+    private String goodsId;   //货物id
+    private String goodsName; //货物名称
+    private Integer goodsType; //货物类型
+    private String goodsTypeStr; //货物类型
+    private Integer goodsUnit; //计量单位
+    private String goodsUnitStr; //计量单位
+    private Double goodsNum;  //货物数量
+    private Double goodsVolume;  //货物体积
+    private Double goodsWeight;  //货物重量
+
+    //=====================更多信息========================
+    private Integer truckType;  //车辆类型
+    private String  truckTypeStr;  //车辆类型
+    private BigDecimal  estimateFreight;  //预估运费
+
+    //=====================路径信息========================
+    private List<KwOrderCarLandTransportPathRes> pathList; //路径信息
+
+    //=====================履约信息========================
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private LocalDateTime perStartTime;   //履约开始时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private LocalDateTime perEndTime;     //履约结束时间
+    private String settlementCycle;          //结算周期
+    private String settlementCycleStr;          //结算周期
+    private String payment;             //支付方式
+    private String paymentStr;             //支付方式
+    private String payCompany;            //付款企业
+    private Integer billingMode;            //计费方式
+    private String billingModeStr;            //计费方式Str
+    private BigDecimal price;            //计费方式Str
+    private String gatheringCompany;    //收款单位
+    private String remark;
+
+    //履约记录
+    private BigDecimal remainNum;         //剩余待运量
+    private BigDecimal remainAllocation;  //剩余待分配量
+    private BigDecimal totalLoadAmount;   //累计装货量
+    private BigDecimal totalUnLoadAmount; //累计卸货量
+
+    //====================扣亏货==========================
+    private String rationalLoss;          //合理损耗
+    private BigDecimal dedPrice;          //扣款单价
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/res/KwOrderCarLandTransportPathRes.java

@@ -1,170 +1,170 @@
-package com.sckw.car.entity.res;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * @desc: 轿运路径信息
- * @author: Lt
- * @date: 2024-04-17
- */
-@Data
-public class KwOrderCarLandTransportPathRes implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    private String id;
-
-    /**
-     * 物流订单id
-     */
-    private String orderId;
-
-    /**
-     * 地址id
-     */
-    private String pathId;
-
-    /**
-     * 线路名称
-     */
-    private String name;
-
-    /*
-     起始地-id
-    */
-    private String loadId;
-
-    /**
-     * 起始地-地址名称
-     */
-    private String loadName;
-
-    /**
-     * 起始地-所在地区
-     */
-    private Integer loadCityCode;
-
-    /**
-     * 起始地-所属区域名称
-     */
-    private String loadCityName;
-
-    /**
-     * 起始地-详细地址
-     */
-    private String loadDetailAddress;
-
-    /**
-     * 起始地-纬度
-     */
-    private String loadLat;
-
-    /**
-     * 起始地-经度
-     */
-    private String loadLng;
-
-    /*
-     起始地-id
-    */
-    private String unLoadId;
-
-    /**
-     * 目的地-地址名称
-     */
-    private String unloadName;
-
-    /**
-     * 目的地-所在地区
-     */
-    private Integer unloadCityCode;
-
-    /**
-     * 目的地-所属区域名称
-     */
-    private String unloadCityName;
-
-    /**
-     * 目的地-详细地址
-     */
-    private String unloadDetailAddress;
-
-    /**
-     * 目的地-纬度
-     */
-    private String unloadLat;
-
-    /**
-     * 目的地-经度
-     */
-    private String unloadLng;
-
-    /**
-     * 运输里程
-     */
-    private BigDecimal transportMileage;
-
-    /**
-     * 运输单价（元/公里）
-     */
-    private BigDecimal transportPrice;
-
-    /**
-     * 运输数量（托运填写量）
-     */
-    private BigDecimal transportAmount;
-
-    /**
-     * 结算货物数量（完结填写量）
-     */
-    private BigDecimal settlementAmount;
-
-    /*
-    计费方式
-     */
-    private String billMode;
-
-    /*
-    计量单位
-     */
-    private Integer unit;
-    private String unitStr;
-
-    /*
-    清单id
-     */
-    //private String goodsId;
-
-    /**
-     * 状态:0正常/1锁定
-     */
-    private Integer status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 更新人
-     */
-    private String updateBy;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
-    private Date createTime;
-
-    private Map<String, Object> goodsListMap;
-
-}
+package com.sckw.car.entity.res;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * @desc: 轿运路径信息
+ * @author: Lt
+ * @date: 2024-04-17
+ */
+@Data
+public class KwOrderCarLandTransportPathRes implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 物流订单id
+     */
+    private String orderId;
+
+    /**
+     * 地址id
+     */
+    private String pathId;
+
+    /**
+     * 线路名称
+     */
+    private String name;
+
+    /*
+     起始地-id
+    */
+    private String loadId;
+
+    /**
+     * 起始地-地址名称
+     */
+    private String loadName;
+
+    /**
+     * 起始地-所在地区
+     */
+    private Integer loadCityCode;
+
+    /**
+     * 起始地-所属区域名称
+     */
+    private String loadCityName;
+
+    /**
+     * 起始地-详细地址
+     */
+    private String loadDetailAddress;
+
+    /**
+     * 起始地-纬度
+     */
+    private String loadLat;
+
+    /**
+     * 起始地-经度
+     */
+    private String loadLng;
+
+    /*
+     起始地-id
+    */
+    private String unLoadId;
+
+    /**
+     * 目的地-地址名称
+     */
+    private String unloadName;
+
+    /**
+     * 目的地-所在地区
+     */
+    private Integer unloadCityCode;
+
+    /**
+     * 目的地-所属区域名称
+     */
+    private String unloadCityName;
+
+    /**
+     * 目的地-详细地址
+     */
+    private String unloadDetailAddress;
+
+    /**
+     * 目的地-纬度
+     */
+    private String unloadLat;
+
+    /**
+     * 目的地-经度
+     */
+    private String unloadLng;
+
+    /**
+     * 运输里程
+     */
+    private BigDecimal transportMileage;
+
+    /**
+     * 运输单价（元/公里）
+     */
+    private BigDecimal transportPrice;
+
+    /**
+     * 运输数量（托运填写量）
+     */
+    private BigDecimal transportAmount;
+
+    /**
+     * 结算货物数量（完结填写量）
+     */
+    private BigDecimal settlementAmount;
+
+    /*
+    计费方式
+     */
+    private String billMode;
+
+    /*
+    计量单位
+     */
+    private Integer unit;
+    private String unitStr;
+
+    /*
+    清单id
+     */
+    //private String goodsId;
+
+    /**
+     * 状态:0正常/1锁定
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private Date createTime;
+
+    private Map<String, Object> goodsListMap;
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/res/KwOrderDetailPath.java

@@ -1,24 +1,24 @@
-package com.sckw.car.entity.res;
-
-import lombok.Data;
-
-/**
- * @desc: 完结订单-运单详情
- * @author: Lt
- * @date: 2024-04-22
- */
-@Data
-public class KwOrderDetailPath {
-
-    /* 路径表id */
-    private String id;
-
-    /* 路径名称 */
-    private String name;
-
-    /* 订单ID */
-    private Long orderId;
-
-    /* 列表ID */
-    private Long goodsId;
-}
+package com.sckw.car.entity.res;
+
+import lombok.Data;
+
+/**
+ * @desc: 完结订单-运单详情
+ * @author: Lt
+ * @date: 2024-04-22
+ */
+@Data
+public class KwOrderDetailPath {
+
+    /* 路径表id */
+    private String id;
+
+    /* 路径名称 */
+    private String name;
+
+    /* 订单ID */
+    private Long orderId;
+
+    /* 列表ID */
+    private Long goodsId;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/res/KwOrderWaybillDetailRes.java

@@ -1,22 +1,22 @@
-package com.sckw.car.entity.res;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @desc: 完结订单-运单详情
- * @author: Lt
- * @date: 2024-04-22
- */
-@Data
-public class KwOrderWaybillDetailRes {
-
-    private Long id;
-
-    private String cyCompany;
-
-    private String tyCompany;
-
-    private List<KwOrderDetailPath> pathList;
-}
+package com.sckw.car.entity.res;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @desc: 完结订单-运单详情
+ * @author: Lt
+ * @date: 2024-04-22
+ */
+@Data
+public class KwOrderWaybillDetailRes {
+
+    private Long id;
+
+    private String cyCompany;
+
+    private String tyCompany;
+
+    private List<KwOrderDetailPath> pathList;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/res/ListAndDetailDto.java

@@ -1,24 +1,24 @@
-package com.sckw.car.entity.res;
-
-import lombok.Data;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-04-18
- */
-@Data
-public class ListAndDetailDto {
-
-    private String id;
-
-    private String name;
-
-    /*
-    编号
-     */
-    private String listOrderNum;
-
-
-
-}
+package com.sckw.car.entity.res;
+
+import lombok.Data;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-04-18
+ */
+@Data
+public class ListAndDetailDto {
+
+    private String id;
+
+    private String name;
+
+    /*
+    编号
+     */
+    private String listOrderNum;
+
+
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/entity/res/ListDetailRes.java

@@ -1,24 +1,24 @@
-package com.sckw.car.entity.res;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-04-17
- */
-@Data
-public class ListDetailRes{
-
-    /*
-    主键id
-     */
-    private String id;
-
-    private String name;
-
-
-    private List<ListAndDetailDto> list;
-}
+package com.sckw.car.entity.res;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-04-17
+ */
+@Data
+public class ListDetailRes{
+
+    /*
+    主键id
+     */
+    private String id;
+
+    private String name;
+
+
+    private List<ListAndDetailDto> list;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/enums/LoadOrUnLoadHandlingEnum.java

@@ -1,42 +1,42 @@
-package com.sckw.car.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * @desc: 装卸类型
- * @author: lt
- * @date: 2024/4/3 0003 10:12
- */
-@AllArgsConstructor
-@Getter
-public enum LoadOrUnLoadHandlingEnum {
-
-    SINGLE(1, "单装卸"),
-    MORE(2, "多装卸");
-
-    private final Integer code;
-    private final String msg;
-
-
-    public static String getNameByCode(Integer code) {
-        LoadOrUnLoadHandlingEnum[] enums = LoadOrUnLoadHandlingEnum.values();
-        for (LoadOrUnLoadHandlingEnum instance : enums) {
-            if (Objects.equals(instance.getCode(), code)) {
-                return instance.getMsg();
-            }
-        }
-        return null;
-    }
-
-    public static List<LoadOrUnLoadHandlingEnum> getSortList() {
-        LoadOrUnLoadHandlingEnum[] enums = LoadOrUnLoadHandlingEnum.values();
-        return Arrays.stream(enums).sorted(Comparator.comparingInt(LoadOrUnLoadHandlingEnum::getCode)).collect(Collectors.toList());
-    }
-}
+package com.sckw.car.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * @desc: 装卸类型
+ * @author: lt
+ * @date: 2024/4/3 0003 10:12
+ */
+@AllArgsConstructor
+@Getter
+public enum LoadOrUnLoadHandlingEnum {
+
+    SINGLE(1, "单装卸"),
+    MORE(2, "多装卸");
+
+    private final Integer code;
+    private final String msg;
+
+
+    public static String getNameByCode(Integer code) {
+        LoadOrUnLoadHandlingEnum[] enums = LoadOrUnLoadHandlingEnum.values();
+        for (LoadOrUnLoadHandlingEnum instance : enums) {
+            if (Objects.equals(instance.getCode(), code)) {
+                return instance.getMsg();
+            }
+        }
+        return null;
+    }
+
+    public static List<LoadOrUnLoadHandlingEnum> getSortList() {
+        LoadOrUnLoadHandlingEnum[] enums = LoadOrUnLoadHandlingEnum.values();
+        return Arrays.stream(enums).sorted(Comparator.comparingInt(LoadOrUnLoadHandlingEnum::getCode)).collect(Collectors.toList());
+    }
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/enums/OrderCarDictTypeEnum.java

@@ -1,25 +1,25 @@
-package com.sckw.car.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@AllArgsConstructor
-@Getter
-public enum OrderCarDictTypeEnum {
-
-    ORDER_SOURCE("order_source", "订单来源"),
-    GOODS_TYPE("goods_type", "商品类型"),
-    GOODS_UNIT("goods_unit", "货物单位"),
-    ORDER_STATUS("order_status", "订单状态"),
-    TYPE_HANDLING("type_handling", "装卸货类型"),
-    PAY_METHOD("pay_method", "支付方式"),
-    SETTLEMENT_CYCLE("settlement_cycle", "结算周期"),
-    BILLING_MODE("billing_mode", "计费方式"),
-    ADDRESS_TYPE("address_type", "地址类型"),
-    TRUCK_TYPE("truck_type", "车辆类型"),
-
-    ;
-
-    private final String type;
-    private final String name;
-}
+package com.sckw.car.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum OrderCarDictTypeEnum {
+
+    ORDER_SOURCE("order_source", "订单来源"),
+    GOODS_TYPE("goods_type", "商品类型"),
+    GOODS_UNIT("goods_unit", "货物单位"),
+    ORDER_STATUS("order_status", "订单状态"),
+    TYPE_HANDLING("type_handling", "装卸货类型"),
+    PAY_METHOD("pay_method", "支付方式"),
+    SETTLEMENT_CYCLE("settlement_cycle", "结算周期"),
+    BILLING_MODE("billing_mode", "计费方式"),
+    ADDRESS_TYPE("address_type", "地址类型"),
+    TRUCK_TYPE("truck_type", "车辆类型"),
+
+    ;
+
+    private final String type;
+    private final String name;
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/enums/WaybillOrderStatusEnum.java

@@ -1,37 +1,37 @@
-package com.sckw.car.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-@AllArgsConstructor
-@Getter
-public enum WaybillOrderStatusEnum {
-    ONE(1, "草稿"),
-    TWO(2, "提交")
-    ;
-
-    private final Integer code;
-    private final String msg;
-
-
-    public static String getNameByCode(Integer code) {
-        WaybillOrderStatusEnum[] enums = WaybillOrderStatusEnum.values();
-        for (WaybillOrderStatusEnum instance : enums) {
-            if (Objects.equals(instance.getCode(), code)) {
-                return instance.getMsg();
-            }
-        }
-        return null;
-    }
-
-    public static List<WaybillOrderStatusEnum> getSortList() {
-        WaybillOrderStatusEnum[] enums = WaybillOrderStatusEnum.values();
-        return Arrays.stream(enums).sorted(Comparator.comparingInt(WaybillOrderStatusEnum::getCode)).collect(Collectors.toList());
-    }
-}
+package com.sckw.car.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@AllArgsConstructor
+@Getter
+public enum WaybillOrderStatusEnum {
+    ONE(1, "草稿"),
+    TWO(2, "提交")
+    ;
+
+    private final Integer code;
+    private final String msg;
+
+
+    public static String getNameByCode(Integer code) {
+        WaybillOrderStatusEnum[] enums = WaybillOrderStatusEnum.values();
+        for (WaybillOrderStatusEnum instance : enums) {
+            if (Objects.equals(instance.getCode(), code)) {
+                return instance.getMsg();
+            }
+        }
+        return null;
+    }
+
+    public static List<WaybillOrderStatusEnum> getSortList() {
+        WaybillOrderStatusEnum[] enums = WaybillOrderStatusEnum.values();
+        return Arrays.stream(enums).sorted(Comparator.comparingInt(WaybillOrderStatusEnum::getCode)).collect(Collectors.toList());
+    }
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/enums/WaybillStatusEnums.java

@@ -1,47 +1,47 @@
-package com.sckw.car.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-04-29
- */
-@AllArgsConstructor
-@Getter
-public enum WaybillStatusEnums {
-    ONE(1, "待接单"),
-    TWO(2, "待出车"),
-    THREE(3, "运输中"),
-    FOUR(4, "待核验"),
-    FIVE(5, "已完成"),
-    SIX(6, "拒接单"),
-    SEVEN(7, "已驳回")
-    ;
-
-    private final Integer code;
-    private final String msg;
-
-
-    public static String getNameByCode(Integer code) {
-        WaybillStatusEnums[] enums = WaybillStatusEnums.values();
-        for (WaybillStatusEnums instance : enums) {
-            if (Objects.equals(instance.getCode(), code)) {
-                return instance.getMsg();
-            }
-        }
-        return null;
-    }
-
-    public static List<WaybillStatusEnums> getSortList() {
-        WaybillStatusEnums[] enums = WaybillStatusEnums.values();
-        return Arrays.stream(enums).sorted(Comparator.comparingInt(WaybillStatusEnums::getCode)).collect(Collectors.toList());
-    }
-}
+package com.sckw.car.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-04-29
+ */
+@AllArgsConstructor
+@Getter
+public enum WaybillStatusEnums {
+    ONE(1, "待接单"),
+    TWO(2, "待出车"),
+    THREE(3, "运输中"),
+    FOUR(4, "待核验"),
+    FIVE(5, "已完成"),
+    SIX(6, "拒接单"),
+    SEVEN(7, "已驳回")
+    ;
+
+    private final Integer code;
+    private final String msg;
+
+
+    public static String getNameByCode(Integer code) {
+        WaybillStatusEnums[] enums = WaybillStatusEnums.values();
+        for (WaybillStatusEnums instance : enums) {
+            if (Objects.equals(instance.getCode(), code)) {
+                return instance.getMsg();
+            }
+        }
+        return null;
+    }
+
+    public static List<WaybillStatusEnums> getSortList() {
+        WaybillStatusEnums[] enums = WaybillStatusEnums.values();
+        return Arrays.stream(enums).sorted(Comparator.comparingInt(WaybillStatusEnums::getCode)).collect(Collectors.toList());
+    }
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/mapper/KwCarOrderMapper.java

@@ -1,20 +1,20 @@
-package com.sckw.car.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.car.entity.KwCarOrder;
-import org.apache.ibatis.annotations.MapKey;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface KwCarOrderMapper extends BaseMapper<KwCarOrder> {
-
-    List<Map<String, Object>> countByStatus(@Param("tenant") String tenant);
-
-    @MapKey("waybillCount")
-    int finishWaybillCount(String orderId);
-
-}
+package com.sckw.car.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.car.entity.KwCarOrder;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface KwCarOrderMapper extends BaseMapper<KwCarOrder> {
+
+    List<Map<String, Object>> countByStatus(@Param("tenant") String tenant);
+
+    @MapKey("waybillCount")
+    int finishWaybillCount(String orderId);
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/mapper/KwCarWaybillOrderMapper.java

@@ -1,19 +1,19 @@
-package com.sckw.car.mapper;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.car.entity.KwCarWaybillOrder;
-import com.sckw.car.entity.res.KwOrderWaybillDetailRes;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-@TableName("kw_waybill_order")
-public interface KwCarWaybillOrderMapper extends BaseMapper<KwCarWaybillOrder> {
-
-    KwOrderWaybillDetailRes selectWaybillDetailById(String orderId);
-
-    void insertBatch(@Param(value = "list") List<KwCarWaybillOrder> list);
-}
+package com.sckw.car.mapper;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.car.entity.KwCarWaybillOrder;
+import com.sckw.car.entity.res.KwOrderWaybillDetailRes;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+@TableName("kw_waybill_order")
+public interface KwCarWaybillOrderMapper extends BaseMapper<KwCarWaybillOrder> {
+
+    KwOrderWaybillDetailRes selectWaybillDetailById(String orderId);
+
+    void insertBatch(@Param(value = "list") List<KwCarWaybillOrder> list);
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/mapper/KwOrderCarDictMapper.java

@@ -1,12 +1,12 @@
-package com.sckw.car.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.car.entity.KwCarOrderDict;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface KwOrderCarDictMapper extends BaseMapper<KwCarOrderDict> {
-    List<KwCarOrderDict> queryByType(String group);
-}
+package com.sckw.car.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.car.entity.KwCarOrderDict;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface KwOrderCarDictMapper extends BaseMapper<KwCarOrderDict> {
+    List<KwCarOrderDict> queryByType(String group);
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/mapper/KwOrderCarLandTransportDefGoodsMapper.java

@@ -1,9 +1,9 @@
-package com.sckw.car.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.car.entity.KwOrderCarLandTransportDefGoods;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface KwOrderCarLandTransportDefGoodsMapper extends BaseMapper<KwOrderCarLandTransportDefGoods> {
-}
+package com.sckw.car.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.car.entity.KwOrderCarLandTransportDefGoods;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface KwOrderCarLandTransportDefGoodsMapper extends BaseMapper<KwOrderCarLandTransportDefGoods> {
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/mapper/KwOrderCarLandTransportInventoryMapper.java

@@ -1,18 +1,18 @@
-package com.sckw.car.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.car.entity.KwOrderCarLandTransportInventory;
-import com.sckw.car.entity.res.CarDetailRes;
-import com.sckw.car.entity.res.ListDetailRes;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface KwOrderCarLandTransportInventoryMapper extends BaseMapper<KwOrderCarLandTransportInventory> {
-
-    List<ListDetailRes> selectList(@Param("name") String name);
-
-    CarDetailRes selectByOrderId(@Param("orderId") String orderId);
-}
+package com.sckw.car.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.car.entity.KwOrderCarLandTransportInventory;
+import com.sckw.car.entity.res.CarDetailRes;
+import com.sckw.car.entity.res.ListDetailRes;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface KwOrderCarLandTransportInventoryMapper extends BaseMapper<KwOrderCarLandTransportInventory> {
+
+    List<ListDetailRes> selectList(@Param("name") String name);
+
+    CarDetailRes selectByOrderId(@Param("orderId") String orderId);
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/mapper/KwOrderCarLandTransportMoreMapper.java

@@ -1,9 +1,9 @@
-package com.sckw.car.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.car.entity.KwOrderCarLandTransportMore;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface KwOrderCarLandTransportMoreMapper extends BaseMapper<KwOrderCarLandTransportMore> {
-}
+package com.sckw.car.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.car.entity.KwOrderCarLandTransportMore;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface KwOrderCarLandTransportMoreMapper extends BaseMapper<KwOrderCarLandTransportMore> {
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/mapper/KwOrderCarLandTransportPathGoodsMapper.java

@@ -1,15 +1,15 @@
-package com.sckw.car.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.car.entity.KwOrderCarLandTransportPathGoods;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface KwOrderCarLandTransportPathGoodsMapper extends BaseMapper<KwOrderCarLandTransportPathGoods> {
-
-    void insertBatch(@Param(value = "list") List<KwOrderCarLandTransportPathGoods> list);
-
-}
+package com.sckw.car.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.car.entity.KwOrderCarLandTransportPathGoods;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface KwOrderCarLandTransportPathGoodsMapper extends BaseMapper<KwOrderCarLandTransportPathGoods> {
+
+    void insertBatch(@Param(value = "list") List<KwOrderCarLandTransportPathGoods> list);
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/mapper/KwOrderCarLandTransportPathMapper.java

@@ -1,16 +1,16 @@
-package com.sckw.car.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.car.entity.KwOrderCarLandTransportPath;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface KwOrderCarLandTransportPathMapper extends BaseMapper<KwOrderCarLandTransportPath> {
-
-    int batchUpdateSettlementAmount(List<KwOrderCarLandTransportPath> pathsToUpdate);
-
-    List<KwOrderCarLandTransportPath> getPathListByOrderId(String orderId);
-
-}
+package com.sckw.car.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.car.entity.KwOrderCarLandTransportPath;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface KwOrderCarLandTransportPathMapper extends BaseMapper<KwOrderCarLandTransportPath> {
+
+    int batchUpdateSettlementAmount(List<KwOrderCarLandTransportPath> pathsToUpdate);
+
+    List<KwOrderCarLandTransportPath> getPathListByOrderId(String orderId);
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/mapper/KwOrderCarLandTransportPerMapper.java

@@ -1,11 +1,11 @@
-package com.sckw.car.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.car.entity.KwOrderCarLandTransportPer;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface KwOrderCarLandTransportPerMapper extends BaseMapper<KwOrderCarLandTransportPer> {
-
-
-}
+package com.sckw.car.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.car.entity.KwOrderCarLandTransportPer;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface KwOrderCarLandTransportPerMapper extends BaseMapper<KwOrderCarLandTransportPer> {
+
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/mapper/KwOrderCarLandTransportTrackMapper.java

@@ -1,9 +1,9 @@
-package com.sckw.car.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.car.entity.KwOrderCarLandTransportTrack;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface KwOrderCarLandTransportTrackMapper extends BaseMapper<KwOrderCarLandTransportTrack> {
-}
+package com.sckw.car.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.car.entity.KwOrderCarLandTransportTrack;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface KwOrderCarLandTransportTrackMapper extends BaseMapper<KwOrderCarLandTransportTrack> {
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/mapper/KwOrderCarWaybillOrderDispatchAddressMapper.java

@@ -1,14 +1,14 @@
-package com.sckw.car.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.car.entity.KwOrderCarWaybillOrderDispatchAddress;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface KwOrderCarWaybillOrderDispatchAddressMapper extends BaseMapper<KwOrderCarWaybillOrderDispatchAddress> {
-
-    void insertBatch(@Param("list") List<KwOrderCarWaybillOrderDispatchAddress> kwOrderCarWaybillOrderDispatchAddress);
-}
+package com.sckw.car.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.car.entity.KwOrderCarWaybillOrderDispatchAddress;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface KwOrderCarWaybillOrderDispatchAddressMapper extends BaseMapper<KwOrderCarWaybillOrderDispatchAddress> {
+
+    void insertBatch(@Param("list") List<KwOrderCarWaybillOrderDispatchAddress> kwOrderCarWaybillOrderDispatchAddress);
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/mapper/KwOrderCarWaybillOrderDispatchAssignMapper.java

@@ -1,14 +1,14 @@
-package com.sckw.car.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.car.entity.KwOrderCarWaybillOrderDispatchAssign;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface KwOrderCarWaybillOrderDispatchAssignMapper extends BaseMapper<KwOrderCarWaybillOrderDispatchAssign> {
-
-    void insertBatch(@Param("list") List<KwOrderCarWaybillOrderDispatchAssign> kwOrderCarWaybillOrderDispatchAssign);
-}
+package com.sckw.car.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.car.entity.KwOrderCarWaybillOrderDispatchAssign;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface KwOrderCarWaybillOrderDispatchAssignMapper extends BaseMapper<KwOrderCarWaybillOrderDispatchAssign> {
+
+    void insertBatch(@Param("list") List<KwOrderCarWaybillOrderDispatchAssign> kwOrderCarWaybillOrderDispatchAssign);
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/mapper/KwOrderCarWaybillOrderDispatchMapper.java

@@ -1,14 +1,14 @@
-package com.sckw.car.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.car.entity.KwOrderCarWaybillOrderDispatch;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface KwOrderCarWaybillOrderDispatchMapper extends BaseMapper<KwOrderCarWaybillOrderDispatch> {
-
-    void insertBatch(@Param(value = "list") List<KwOrderCarWaybillOrderDispatch> list);
-}
+package com.sckw.car.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.car.entity.KwOrderCarWaybillOrderDispatch;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface KwOrderCarWaybillOrderDispatchMapper extends BaseMapper<KwOrderCarWaybillOrderDispatch> {
+
+    void insertBatch(@Param(value = "list") List<KwOrderCarWaybillOrderDispatch> list);
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/mapper/KwOrderCarWaybillTransportPathGoodsMapper.java

@@ -1,13 +1,13 @@
-package com.sckw.car.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.car.entity.KwOrderCarWaybillTransportPathGoods;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface KwOrderCarWaybillTransportPathGoodsMapper extends BaseMapper<KwOrderCarWaybillTransportPathGoods> {
-    void insertBatch(@Param(value = "list") List<KwOrderCarWaybillTransportPathGoods> list);
-}
+package com.sckw.car.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.car.entity.KwOrderCarWaybillTransportPathGoods;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface KwOrderCarWaybillTransportPathGoodsMapper extends BaseMapper<KwOrderCarWaybillTransportPathGoods> {
+    void insertBatch(@Param(value = "list") List<KwOrderCarWaybillTransportPathGoods> list);
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/service/CarTransportListService.java

@@ -1,245 +1,245 @@
-package com.sckw.car.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.sckw.car.entity.KwOrderCarLandTransportPath;
-import com.sckw.car.entity.KwOrderCarLandTransportPathGoods;
-import com.sckw.car.entity.res.CarDetailRes;
-import com.sckw.car.entity.res.KwOrderCarLandTransportPathRes;
-import com.sckw.car.entity.res.ListDetailRes;
-import com.sckw.car.enums.OrderCarDictTypeEnum;
-import com.sckw.car.mapper.KwCarOrderMapper;
-import com.sckw.car.mapper.KwOrderCarLandTransportInventoryMapper;
-import com.sckw.car.mapper.KwOrderCarLandTransportPathGoodsMapper;
-import com.sckw.car.mapper.KwOrderCarLandTransportPathMapper;
-import com.sckw.core.model.constant.Global;
-import com.sckw.core.model.enums.OrderCarStatusEnum;
-import com.sckw.core.utils.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-04-17
- */
-@Service
-public class CarTransportListService {
-    @Autowired
-    KwOrderCarLandTransportInventoryMapper kwOrderCarLandTransportListMapper;
-
-    @Autowired
-    OrderCarDictService orderCarDictService;
-
-    @Autowired
-    KwOrderCarLandTransportPathMapper kwOrderCarLandTransportPathMapper;
-
-    @Autowired
-    KwOrderCarLandTransportPathGoodsMapper kwOrderCarLandTransportPathGoodsMapper;
-
-    @Autowired
-    KwCarOrderMapper kwCarOrderMapper;
-
-    public List<ListDetailRes> listDetail(String name)
-    {
-        return kwOrderCarLandTransportListMapper.selectList(name);
-    }
-
-    public CarDetailRes detail(String orderId)
-    {
-        CarDetailRes carDetailRes = kwOrderCarLandTransportListMapper.selectByOrderId(orderId);
-        if(ObjectUtils.isNotNull(carDetailRes)) {
-            Map<String, Map<String, String>> dict = orderCarDictService.queryDictByType(new ArrayList<>(
-                    Arrays.asList(OrderCarDictTypeEnum.TYPE_HANDLING.getType()
-                            ,OrderCarDictTypeEnum.ORDER_STATUS.getType()
-                            ,OrderCarDictTypeEnum.SETTLEMENT_CYCLE.getType()
-                            ,OrderCarDictTypeEnum.PAY_METHOD.getType()
-                            ,OrderCarDictTypeEnum.BILLING_MODE.getType()
-                            ,OrderCarDictTypeEnum.GOODS_TYPE.getType()
-                            ,OrderCarDictTypeEnum.GOODS_UNIT.getType()
-                            ,OrderCarDictTypeEnum.TRUCK_TYPE.getType()
-                    )));
-            Map<String, String> typeHandlMap, truckTypeMap, orderStatusMap, billingCycleMap, payMethodMap, charingModedMap,goodsTypeMap,GoodsUnitMap;
-            if (CollectionUtils.isNotEmpty(dict)) {
-                typeHandlMap = CollectionUtils.isNotEmpty(dict.get(OrderCarDictTypeEnum.TYPE_HANDLING.getType())) ? dict.get(OrderCarDictTypeEnum.TYPE_HANDLING.getType()) : new HashMap<>(16);
-                orderStatusMap = CollectionUtils.isNotEmpty(dict.get(OrderCarDictTypeEnum.ORDER_STATUS.getType())) ? dict.get(OrderCarDictTypeEnum.ORDER_STATUS.getType()) : new HashMap<>(16);
-                billingCycleMap = CollectionUtils.isNotEmpty(dict.get(OrderCarDictTypeEnum.SETTLEMENT_CYCLE.getType())) ? dict.get(OrderCarDictTypeEnum.SETTLEMENT_CYCLE.getType()) : new HashMap<>(16);
-                payMethodMap = CollectionUtils.isNotEmpty(dict.get(OrderCarDictTypeEnum.PAY_METHOD.getType())) ? dict.get(OrderCarDictTypeEnum.PAY_METHOD.getType()) : new HashMap<>(16);
-                charingModedMap = CollectionUtils.isNotEmpty(dict.get(OrderCarDictTypeEnum.BILLING_MODE.getType())) ? dict.get(OrderCarDictTypeEnum.BILLING_MODE.getType()) : new HashMap<>(16);
-                goodsTypeMap = CollectionUtils.isNotEmpty(dict.get(OrderCarDictTypeEnum.GOODS_TYPE.getType())) ? dict.get(OrderCarDictTypeEnum.GOODS_TYPE.getType()) : new HashMap<>(16);
-                GoodsUnitMap = CollectionUtils.isNotEmpty(dict.get(OrderCarDictTypeEnum.GOODS_UNIT.getType())) ? dict.get(OrderCarDictTypeEnum.GOODS_UNIT.getType()) : new HashMap<>(16);
-                truckTypeMap = CollectionUtils.isNotEmpty(dict.get(OrderCarDictTypeEnum.TRUCK_TYPE.getType())) ? dict.get(OrderCarDictTypeEnum.TRUCK_TYPE.getType()) : new HashMap<>(16);
-            } else {
-                typeHandlMap = new HashMap<>(16);
-                orderStatusMap = new HashMap<>(16);
-                billingCycleMap = new HashMap<>(16);
-                payMethodMap = new HashMap<>(16);
-                charingModedMap = new HashMap<>(16);
-                goodsTypeMap = new HashMap<>(16);
-                GoodsUnitMap = new HashMap<>(16);
-                truckTypeMap = new HashMap<>(16);
-            }
-            if (ObjectUtils.isNotNull(carDetailRes.getTypeHandling())){
-                carDetailRes.setTypeHandlingStr(typeHandlMap.get(carDetailRes.getTypeHandling().toString()));
-            }
-            if (ObjectUtils.isNotNull(carDetailRes.getStatus())){
-                carDetailRes.setStatusStr(orderStatusMap.get(carDetailRes.getStatus().toString()));
-            }
-            if (ObjectUtils.isNotNull(carDetailRes.getPayment())) {
-                carDetailRes.setPaymentStr(payMethodMap.get(carDetailRes.getPayment().toString()));
-            }
-            if (ObjectUtils.isNotNull(carDetailRes.getSettlementCycle())) {
-                carDetailRes.setSettlementCycleStr(billingCycleMap.get(carDetailRes.getSettlementCycle().toString()));
-            }
-            if (ObjectUtils.isNotNull(carDetailRes.getBillingMode())) {
-                carDetailRes.setBillingModeStr(charingModedMap.get(carDetailRes.getBillingMode().toString()));
-            }
-            if (ObjectUtils.isNotNull(carDetailRes.getGoodsType())) {
-                carDetailRes.setGoodsTypeStr(goodsTypeMap.get(carDetailRes.getGoodsType().toString()));
-            }
-            if (ObjectUtils.isNotNull(carDetailRes.getGoodsUnit())) {
-                carDetailRes.setGoodsUnitStr(GoodsUnitMap.get(carDetailRes.getGoodsUnit().toString()));
-            }
-            if (ObjectUtils.isNotNull(carDetailRes.getTruckType())) {
-                carDetailRes.setTruckTypeStr(truckTypeMap.get(carDetailRes.getTruckType().toString()));
-            }
-            //查询路径信息
-            List<KwOrderCarLandTransportPath> pathLists = kwOrderCarLandTransportPathMapper.getPathListByOrderId(orderId);
-            if (!CollectionUtils.isEmpty(pathLists)) {
-                List<KwOrderCarLandTransportPathRes> kwOrderCarLandTransportPaths = new ArrayList<>(pathLists.size());
-                Map<String, Object> goodsListMap = null;
-                for (KwOrderCarLandTransportPath path : pathLists) {
-                    KwOrderCarLandTransportPathRes pathRes = new KwOrderCarLandTransportPathRes();
-                    // 主键
-                    pathRes.setId(path.getId());
-                    // 物流订单id
-                    pathRes.setOrderId(path.getOrderId());
-                    // 线路id
-                    pathRes.setPathId(path.getPathId());
-                    // 线路名称
-                    pathRes.setName(path.getName());
-                    // 起始地-id
-                    pathRes.setLoadId(path.getLoadAddressId());
-                    // 起始地-地址名称
-                    pathRes.setLoadName(path.getLoadName());
-                    // 起始地-所在地区
-                    pathRes.setLoadCityCode(path.getLoadCityCode());
-                    // 起始地-所属区域名称
-                    pathRes.setLoadCityName(path.getLoadCityName());
-                    // 起始地-详细地址
-                    pathRes.setLoadDetailAddress(path.getLoadDetailAddress());
-                    // 起始地-纬度
-                    pathRes.setLoadLat(path.getLoadLat());
-                    // 起始地-经度
-                    pathRes.setLoadLng(path.getLoadLng());
-                    // 目的地-id
-                    pathRes.setUnLoadId(path.getUnloadAddressId());
-                    // 目的地-地址名称
-                    pathRes.setUnloadName(path.getUnloadName());
-                    // 目的地-所在地区
-                    pathRes.setUnloadCityCode(path.getUnloadCityCode());
-                    // 目的地-所属区域名称
-                    pathRes.setUnloadCityName(path.getUnloadCityName());
-                    // 目的地-详细地址
-                    pathRes.setUnloadDetailAddress(path.getUnloadDetailAddress());
-                    // 目的地-纬度
-                    pathRes.setUnloadLat(path.getUnloadLat());
-                    // 目的地-经度
-                    pathRes.setUnloadLng(path.getUnloadLng());
-                    // 运输里程
-                    pathRes.setTransportMileage(path.getTransportMileage());
-                    // 里程价(元)
-                    pathRes.setTransportPrice(path.getTransportPrice());
-                    // 运输数量（托运填写量）
-                    pathRes.setTransportAmount(path.getTransportAmount());
-                    // 结算货物数量（完结填写量）
-                    pathRes.setSettlementAmount(path.getSettlementAmount());
-                    // 计量单位
-                    // 计货方式  0货物清单  1无清单货物
-                    //pathRes.setUnitStr(GoodsUnitMap.get(path.getUnit().toString()));
-                    //pathRes.setUnitStr(GoodsUnitMap.getOrDefault(path.getUnit().toString(), null));
-                    if (ObjectUtils.isNotNull(path.getUnit())) {
-                        pathRes.setUnit(path.getUnit());
-                        pathRes.setUnitStr(GoodsUnitMap.get(path.getUnit().toString()));
-                    }
-                    // 计费方式
-                    pathRes.setBillMode(path.getBillMode());
-
-                    pathRes.setStatus(path.getStatus());
-                    // 备注
-                    pathRes.setRemark(path.getRemark());
-
-                    //查询清单
-                    LambdaQueryWrapper<KwOrderCarLandTransportPathGoods> wrapper = new LambdaQueryWrapper<>();
-                    wrapper.eq(KwOrderCarLandTransportPathGoods::getCarPathId, path.getId()).eq(KwOrderCarLandTransportPathGoods::getDelFlag, Global.NUMERICAL_ZERO);
-                    List<KwOrderCarLandTransportPathGoods> kwOrderCarLandTransportPathGoods = kwOrderCarLandTransportPathGoodsMapper.selectList(wrapper);
-                    if (!CollectionUtils.isEmpty(kwOrderCarLandTransportPathGoods)) {
-                        String goodsNameCop = "";
-                        String goodsId = "";
-                        List<Map<String, String>> childrenList = new ArrayList<>();
-                        for (KwOrderCarLandTransportPathGoods f : kwOrderCarLandTransportPathGoods) {
-                            Map<String, String> child = new HashMap<>();
-                            child.put("goodsNum", f.getGoodsNum()); // 假设所有孩子的goodsNum相同，实际情况可能不同
-                            childrenList.add(child);
-                            goodsNameCop = f.getGoodsName();
-                            goodsId = f.getGoodsId();
-                        }
-                        // 创建表示goodsList的Map
-                        goodsListMap = new HashMap<>();
-                        goodsListMap.put("goodsId", goodsId);
-                        goodsListMap.put("goodsName", goodsNameCop);
-                        goodsListMap.put("children", childrenList);
-                    }
-
-                    pathRes.setGoodsListMap(goodsListMap);
-
-                    kwOrderCarLandTransportPaths.add(pathRes);
-
-
-                }
-                carDetailRes.setPathList(kwOrderCarLandTransportPaths);
-            }
-
-
-        }
-        
-        
-        return carDetailRes;
-    }
-
-    public HashMap<String, Object> completeDetail(String orderId)
-    {
-        int waybill5Count = kwCarOrderMapper.finishWaybillCount(orderId);
-        HashMap<String, Object> objectObjectHashMap = new HashMap<>();
-        objectObjectHashMap.put("taskNum", waybill5Count);
-        return objectObjectHashMap;
-    }
-
-    public List<Map<String, Object>> getStatusCountListInSingleQuery() {
-        // 查询每个状态的计数
-        String tenant = TenantUtil.getTenant();
-        List<Map<String, Object>> statusCounts = kwCarOrderMapper.countByStatus(tenant);
-
-        // 将查询结果转换为所需的格式
-        List<OrderCarStatusEnum> sortedEnums = OrderCarStatusEnum.getSortList();
-        List<Map<String, Object>> result = new ArrayList<>();
-        for (OrderCarStatusEnum enumItem : sortedEnums) {
-            Map<String, Object> statusCount = statusCounts.stream()
-                    .filter(c -> enumItem.getCode().equals(c.get("status")))
-                    .findFirst()
-                    .orElseGet(() -> Map.of("status", enumItem.getCode(), "count", 0));
-            result.add(
-                    Map.of(
-                            "key", enumItem.getMsg(),
-                            "value", enumItem.getCode(),
-                            "data", statusCount.get("count")
-                    )
-            );
-        }
-        return result;
-    }
-
-
-}
+package com.sckw.car.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.sckw.car.entity.KwOrderCarLandTransportPath;
+import com.sckw.car.entity.KwOrderCarLandTransportPathGoods;
+import com.sckw.car.entity.res.CarDetailRes;
+import com.sckw.car.entity.res.KwOrderCarLandTransportPathRes;
+import com.sckw.car.entity.res.ListDetailRes;
+import com.sckw.car.enums.OrderCarDictTypeEnum;
+import com.sckw.car.mapper.KwCarOrderMapper;
+import com.sckw.car.mapper.KwOrderCarLandTransportInventoryMapper;
+import com.sckw.car.mapper.KwOrderCarLandTransportPathGoodsMapper;
+import com.sckw.car.mapper.KwOrderCarLandTransportPathMapper;
+import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.enums.OrderCarStatusEnum;
+import com.sckw.core.utils.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-04-17
+ */
+@Service
+public class CarTransportListService {
+    @Autowired
+    KwOrderCarLandTransportInventoryMapper kwOrderCarLandTransportListMapper;
+
+    @Autowired
+    OrderCarDictService orderCarDictService;
+
+    @Autowired
+    KwOrderCarLandTransportPathMapper kwOrderCarLandTransportPathMapper;
+
+    @Autowired
+    KwOrderCarLandTransportPathGoodsMapper kwOrderCarLandTransportPathGoodsMapper;
+
+    @Autowired
+    KwCarOrderMapper kwCarOrderMapper;
+
+    public List<ListDetailRes> listDetail(String name)
+    {
+        return kwOrderCarLandTransportListMapper.selectList(name);
+    }
+
+    public CarDetailRes detail(String orderId)
+    {
+        CarDetailRes carDetailRes = kwOrderCarLandTransportListMapper.selectByOrderId(orderId);
+        if(ObjectUtils.isNotNull(carDetailRes)) {
+            Map<String, Map<String, String>> dict = orderCarDictService.queryDictByType(new ArrayList<>(
+                    Arrays.asList(OrderCarDictTypeEnum.TYPE_HANDLING.getType()
+                            ,OrderCarDictTypeEnum.ORDER_STATUS.getType()
+                            ,OrderCarDictTypeEnum.SETTLEMENT_CYCLE.getType()
+                            ,OrderCarDictTypeEnum.PAY_METHOD.getType()
+                            ,OrderCarDictTypeEnum.BILLING_MODE.getType()
+                            ,OrderCarDictTypeEnum.GOODS_TYPE.getType()
+                            ,OrderCarDictTypeEnum.GOODS_UNIT.getType()
+                            ,OrderCarDictTypeEnum.TRUCK_TYPE.getType()
+                    )));
+            Map<String, String> typeHandlMap, truckTypeMap, orderStatusMap, billingCycleMap, payMethodMap, charingModedMap,goodsTypeMap,GoodsUnitMap;
+            if (CollectionUtils.isNotEmpty(dict)) {
+                typeHandlMap = CollectionUtils.isNotEmpty(dict.get(OrderCarDictTypeEnum.TYPE_HANDLING.getType())) ? dict.get(OrderCarDictTypeEnum.TYPE_HANDLING.getType()) : new HashMap<>(16);
+                orderStatusMap = CollectionUtils.isNotEmpty(dict.get(OrderCarDictTypeEnum.ORDER_STATUS.getType())) ? dict.get(OrderCarDictTypeEnum.ORDER_STATUS.getType()) : new HashMap<>(16);
+                billingCycleMap = CollectionUtils.isNotEmpty(dict.get(OrderCarDictTypeEnum.SETTLEMENT_CYCLE.getType())) ? dict.get(OrderCarDictTypeEnum.SETTLEMENT_CYCLE.getType()) : new HashMap<>(16);
+                payMethodMap = CollectionUtils.isNotEmpty(dict.get(OrderCarDictTypeEnum.PAY_METHOD.getType())) ? dict.get(OrderCarDictTypeEnum.PAY_METHOD.getType()) : new HashMap<>(16);
+                charingModedMap = CollectionUtils.isNotEmpty(dict.get(OrderCarDictTypeEnum.BILLING_MODE.getType())) ? dict.get(OrderCarDictTypeEnum.BILLING_MODE.getType()) : new HashMap<>(16);
+                goodsTypeMap = CollectionUtils.isNotEmpty(dict.get(OrderCarDictTypeEnum.GOODS_TYPE.getType())) ? dict.get(OrderCarDictTypeEnum.GOODS_TYPE.getType()) : new HashMap<>(16);
+                GoodsUnitMap = CollectionUtils.isNotEmpty(dict.get(OrderCarDictTypeEnum.GOODS_UNIT.getType())) ? dict.get(OrderCarDictTypeEnum.GOODS_UNIT.getType()) : new HashMap<>(16);
+                truckTypeMap = CollectionUtils.isNotEmpty(dict.get(OrderCarDictTypeEnum.TRUCK_TYPE.getType())) ? dict.get(OrderCarDictTypeEnum.TRUCK_TYPE.getType()) : new HashMap<>(16);
+            } else {
+                typeHandlMap = new HashMap<>(16);
+                orderStatusMap = new HashMap<>(16);
+                billingCycleMap = new HashMap<>(16);
+                payMethodMap = new HashMap<>(16);
+                charingModedMap = new HashMap<>(16);
+                goodsTypeMap = new HashMap<>(16);
+                GoodsUnitMap = new HashMap<>(16);
+                truckTypeMap = new HashMap<>(16);
+            }
+            if (ObjectUtils.isNotNull(carDetailRes.getTypeHandling())){
+                carDetailRes.setTypeHandlingStr(typeHandlMap.get(carDetailRes.getTypeHandling().toString()));
+            }
+            if (ObjectUtils.isNotNull(carDetailRes.getStatus())){
+                carDetailRes.setStatusStr(orderStatusMap.get(carDetailRes.getStatus().toString()));
+            }
+            if (ObjectUtils.isNotNull(carDetailRes.getPayment())) {
+                carDetailRes.setPaymentStr(payMethodMap.get(carDetailRes.getPayment().toString()));
+            }
+            if (ObjectUtils.isNotNull(carDetailRes.getSettlementCycle())) {
+                carDetailRes.setSettlementCycleStr(billingCycleMap.get(carDetailRes.getSettlementCycle().toString()));
+            }
+            if (ObjectUtils.isNotNull(carDetailRes.getBillingMode())) {
+                carDetailRes.setBillingModeStr(charingModedMap.get(carDetailRes.getBillingMode().toString()));
+            }
+            if (ObjectUtils.isNotNull(carDetailRes.getGoodsType())) {
+                carDetailRes.setGoodsTypeStr(goodsTypeMap.get(carDetailRes.getGoodsType().toString()));
+            }
+            if (ObjectUtils.isNotNull(carDetailRes.getGoodsUnit())) {
+                carDetailRes.setGoodsUnitStr(GoodsUnitMap.get(carDetailRes.getGoodsUnit().toString()));
+            }
+            if (ObjectUtils.isNotNull(carDetailRes.getTruckType())) {
+                carDetailRes.setTruckTypeStr(truckTypeMap.get(carDetailRes.getTruckType().toString()));
+            }
+            //查询路径信息
+            List<KwOrderCarLandTransportPath> pathLists = kwOrderCarLandTransportPathMapper.getPathListByOrderId(orderId);
+            if (!CollectionUtils.isEmpty(pathLists)) {
+                List<KwOrderCarLandTransportPathRes> kwOrderCarLandTransportPaths = new ArrayList<>(pathLists.size());
+                Map<String, Object> goodsListMap = null;
+                for (KwOrderCarLandTransportPath path : pathLists) {
+                    KwOrderCarLandTransportPathRes pathRes = new KwOrderCarLandTransportPathRes();
+                    // 主键
+                    pathRes.setId(path.getId());
+                    // 物流订单id
+                    pathRes.setOrderId(path.getOrderId());
+                    // 线路id
+                    pathRes.setPathId(path.getPathId());
+                    // 线路名称
+                    pathRes.setName(path.getName());
+                    // 起始地-id
+                    pathRes.setLoadId(path.getLoadAddressId());
+                    // 起始地-地址名称
+                    pathRes.setLoadName(path.getLoadName());
+                    // 起始地-所在地区
+                    pathRes.setLoadCityCode(path.getLoadCityCode());
+                    // 起始地-所属区域名称
+                    pathRes.setLoadCityName(path.getLoadCityName());
+                    // 起始地-详细地址
+                    pathRes.setLoadDetailAddress(path.getLoadDetailAddress());
+                    // 起始地-纬度
+                    pathRes.setLoadLat(path.getLoadLat());
+                    // 起始地-经度
+                    pathRes.setLoadLng(path.getLoadLng());
+                    // 目的地-id
+                    pathRes.setUnLoadId(path.getUnloadAddressId());
+                    // 目的地-地址名称
+                    pathRes.setUnloadName(path.getUnloadName());
+                    // 目的地-所在地区
+                    pathRes.setUnloadCityCode(path.getUnloadCityCode());
+                    // 目的地-所属区域名称
+                    pathRes.setUnloadCityName(path.getUnloadCityName());
+                    // 目的地-详细地址
+                    pathRes.setUnloadDetailAddress(path.getUnloadDetailAddress());
+                    // 目的地-纬度
+                    pathRes.setUnloadLat(path.getUnloadLat());
+                    // 目的地-经度
+                    pathRes.setUnloadLng(path.getUnloadLng());
+                    // 运输里程
+                    pathRes.setTransportMileage(path.getTransportMileage());
+                    // 里程价(元)
+                    pathRes.setTransportPrice(path.getTransportPrice());
+                    // 运输数量（托运填写量）
+                    pathRes.setTransportAmount(path.getTransportAmount());
+                    // 结算货物数量（完结填写量）
+                    pathRes.setSettlementAmount(path.getSettlementAmount());
+                    // 计量单位
+                    // 计货方式  0货物清单  1无清单货物
+                    //pathRes.setUnitStr(GoodsUnitMap.get(path.getUnit().toString()));
+                    //pathRes.setUnitStr(GoodsUnitMap.getOrDefault(path.getUnit().toString(), null));
+                    if (ObjectUtils.isNotNull(path.getUnit())) {
+                        pathRes.setUnit(path.getUnit());
+                        pathRes.setUnitStr(GoodsUnitMap.get(path.getUnit().toString()));
+                    }
+                    // 计费方式
+                    pathRes.setBillMode(path.getBillMode());
+
+                    pathRes.setStatus(path.getStatus());
+                    // 备注
+                    pathRes.setRemark(path.getRemark());
+
+                    //查询清单
+                    LambdaQueryWrapper<KwOrderCarLandTransportPathGoods> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.eq(KwOrderCarLandTransportPathGoods::getCarPathId, path.getId()).eq(KwOrderCarLandTransportPathGoods::getDelFlag, Global.NUMERICAL_ZERO);
+                    List<KwOrderCarLandTransportPathGoods> kwOrderCarLandTransportPathGoods = kwOrderCarLandTransportPathGoodsMapper.selectList(wrapper);
+                    if (!CollectionUtils.isEmpty(kwOrderCarLandTransportPathGoods)) {
+                        String goodsNameCop = "";
+                        String goodsId = "";
+                        List<Map<String, String>> childrenList = new ArrayList<>();
+                        for (KwOrderCarLandTransportPathGoods f : kwOrderCarLandTransportPathGoods) {
+                            Map<String, String> child = new HashMap<>();
+                            child.put("goodsNum", f.getGoodsNum()); // 假设所有孩子的goodsNum相同，实际情况可能不同
+                            childrenList.add(child);
+                            goodsNameCop = f.getGoodsName();
+                            goodsId = f.getGoodsId();
+                        }
+                        // 创建表示goodsList的Map
+                        goodsListMap = new HashMap<>();
+                        goodsListMap.put("goodsId", goodsId);
+                        goodsListMap.put("goodsName", goodsNameCop);
+                        goodsListMap.put("children", childrenList);
+                    }
+
+                    pathRes.setGoodsListMap(goodsListMap);
+
+                    kwOrderCarLandTransportPaths.add(pathRes);
+
+
+                }
+                carDetailRes.setPathList(kwOrderCarLandTransportPaths);
+            }
+
+
+        }
+        
+        
+        return carDetailRes;
+    }
+
+    public HashMap<String, Object> completeDetail(String orderId)
+    {
+        int waybill5Count = kwCarOrderMapper.finishWaybillCount(orderId);
+        HashMap<String, Object> objectObjectHashMap = new HashMap<>();
+        objectObjectHashMap.put("taskNum", waybill5Count);
+        return objectObjectHashMap;
+    }
+
+    public List<Map<String, Object>> getStatusCountListInSingleQuery() {
+        // 查询每个状态的计数
+        String tenant = TenantUtil.getTenant();
+        List<Map<String, Object>> statusCounts = kwCarOrderMapper.countByStatus(tenant);
+
+        // 将查询结果转换为所需的格式
+        List<OrderCarStatusEnum> sortedEnums = OrderCarStatusEnum.getSortList();
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (OrderCarStatusEnum enumItem : sortedEnums) {
+            Map<String, Object> statusCount = statusCounts.stream()
+                    .filter(c -> enumItem.getCode().equals(c.get("status")))
+                    .findFirst()
+                    .orElseGet(() -> Map.of("status", enumItem.getCode(), "count", 0));
+            result.add(
+                    Map.of(
+                            "key", enumItem.getMsg(),
+                            "value", enumItem.getCode(),
+                            "data", statusCount.get("count")
+                    )
+            );
+        }
+        return result;
+    }
+
+
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/service/CarTransportService.java

@@ -1,315 +1,315 @@
-package com.sckw.car.service;
-
-import com.sckw.car.entity.*;
-import com.sckw.car.entity.req.*;
-import com.sckw.car.enums.LoadOrUnLoadHandlingEnum;
-import com.sckw.car.mapper.*;
-import com.sckw.core.model.constant.Global;
-import com.sckw.core.model.enums.OrderCarStatusEnum;
-import com.sckw.core.model.enums.OrderSourceEnum;
-import com.sckw.core.utils.*;
-import com.sckw.redis.utils.GenerateOrderIdUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @desc:
- * @author: Lt
- * @date: 2024-04-16
- */
-@Service
-public class CarTransportService {
-
-    @Autowired
-    GenerateOrderIdUtil generateOrderIdUtil;
-
-    @Autowired
-    KwCarOrderMapper kwCarOrderMapper;
-
-    @Autowired
-    KwOrderCarLandTransportMoreMapper kwOrderCarLandTransportMoreMapper;
-
-    @Autowired
-    KwOrderCarLandTransportPathMapper kwOrderCarLandTransportPathMapper;
-
-    @Autowired
-    KwOrderCarLandTransportPathGoodsMapper kwOrderCarLandTransportPathGoodsMapper;
-
-    @Autowired
-    KwOrderCarLandTransportPerMapper kwOrderCarLandTransportPerMapper;
-
-    @Autowired
-    KwOrderCarLandTransportDefGoodsMapper kwOrderCarLandTransportDefGoodsMapper;
-
-    @Autowired
-    KwOrderCarLandTransportTrackMapper kwOrderCarLandTransportTrackMapper;
-
-    @Transactional
-    public Boolean carTransportAdd(AddLogisticsOrderParam addLogisticsOrderParam)
-    {
-
-        Integer orderStatus = OrderCarStatusEnum.WAIT_TRANSPORT.getCode();
-        //格式验证
-        checkCreateLogisticOrderParam(addLogisticsOrderParam);
-        Long orderId = new IdWorker(Global.NUMERICAL_ONE).nextId();
-        String orderNo = generateOrderIdUtil.getOrderNo("O");
-        //订单存储
-        orderInsert(addLogisticsOrderParam,orderId, orderNo, orderStatus);
-
-        //更多信息
-        moreInsert(addLogisticsOrderParam, String.valueOf(orderId));
-
-        //路径信息存储
-        pathInsert(addLogisticsOrderParam, String.valueOf(orderId));
-
-        // 履约信息存储
-        perInsert(addLogisticsOrderParam, String.valueOf(orderId));
-
-        // 扣亏货新增
-        goodsDefInsert(addLogisticsOrderParam, String.valueOf(orderId));
-
-        orderActionRecordSave(orderId, "轿运新增", orderStatus);
-
-        return true;
-
-        //kwOrderUsualLandTransportGoodsReq goodsReq = addLogisticsOrderParam.getGoodsReq();
-        //KwOrderUsualTransportPerReq perReq = addLogisticsOrderParam.getPerReq();
-        //KwOrderUsualLandTransportDefGoodsReq defGoods = addLogisticsOrderParam.getDefGoods();
-        //KwOrderUsualLandTransportMoreReq usualMore = addLogisticsOrderParam.getOrderMore();
-        //
-        //KwOrder kwOrder = BeanUtil.copyProperties(orderGeneralTransportReq, KwOrder.class);
-        //long id = new IdWorker(Global.NUMERICAL_ONE).nextId();
-        //kwOrder.setId(id);
-        //kwOrder.setOrderNo("O"+ id);//生成订单号
-        //kwOrder.setOrderSource(OrderSourceEnum.SELF_BUILD_NORMAL_LAND_ORDER.getCode()); //普货运输
-        //kwOrder.setPids(String.valueOf(id));
-        //int insert = orderGeneralTransportMapper.insert(kwOrder);
-        //long orderId = kwOrder.getId(); // 获取订单ID
-        //String orderNo = kwOrder.getOrderNo(); // 获取订单ID
-        //
-        //if (insert > 0) {
-        //    LambdaUpdateWrapper<KwOrder> updateWrapper = new LambdaUpdateWrapper<>();
-        //    updateWrapper.eq(KwOrder::getId, kwOrder.getId());
-        //
-        //    int loadAddressSize = 0;
-        //    int unLoadAddressSize = 0;
-        //    //装载地址新增
-        //    if(!loadAddressInfo.isEmpty()) {
-        //        addTransportAddresses(loadAddressInfo, orderId, orderNo, AddressTypeEnum.LOAD_ADDRESS.getCode());
-        //        loadAddressSize = loadAddressInfo.size();
-        //    }
-        //    //卸货地址新增
-        //    if(!unLoadAddressInfo.isEmpty()) {
-        //        addTransportAddresses(loadAddressInfo, orderId, orderNo, AddressTypeEnum.UNLOAD_ADDRESS.getCode());
-        //        unLoadAddressSize = unLoadAddressInfo.size();
-        //    }
-        //    //商品信息新增
-        //    if(com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull(goodsReq)) {
-        //        KwOrderUsualLandTransportGoods goods = BeanUtil.copyProperties(goodsReq, KwOrderUsualLandTransportGoods.class);
-        //        // 在 lambda 表达式中对 address 进行处理，例如赋值
-        //        goods.setOrderId(orderId);
-        //        goods.setOrderNo(orderNo);
-        //        orderGeneralTransportGoodsMapper.insert(goods);
-        //        updateWrapper.set(KwOrder::getGoodsId, goods.getGoodsId());
-        //        updateWrapper.set(KwOrder::getGoodsName, goods.getGoodsName());
-        //        updateWrapper.set(KwOrder::getGoodsType, goods.getGoodsType());
-        //        updateWrapper.set(KwOrder::getGoodsUnit, goods.getGoodsUnit());
-        //    }
-        //    //履约信息新增
-        //    if(com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull(perReq)) {
-        //        KwOrderUsualTransportPer perReqList = BeanUtil.copyProperties(perReq, KwOrderUsualTransportPer.class);
-        //        // 在 lambda 表达式中对 address 进行处理，例如赋值
-        //        perReqList.setOrderId(orderId);
-        //        orderGeneralTransportPerMapper.insert(perReqList);
-        //    }
-        //    //扣亏货信息
-        //    if(com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull(defGoods)) {
-        //        KwOrderUsualLandTransportDefGoods defGoodsParam = BeanUtil.copyProperties(defGoods, KwOrderUsualLandTransportDefGoods.class);
-        //        // 在 lambda 表达式中对 address 进行处理，例如赋值
-        //        defGoodsParam.setOrderId(orderId);
-        //        kwOrderUsualLandTransportDefGoodsMapper.insert(defGoodsParam);
-        //    }
-        //    //更多信息
-        //    if(com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull(usualMore)) {
-        //        KwOrderUsualLandTransportMore orderMore = BeanUtil.copyProperties(usualMore, KwOrderUsualLandTransportMore.class);
-        //        // 在 lambda 表达式中对 address 进行处理，例如赋值
-        //        orderMore.setOrderId(orderId);
-        //        kwOrderUsualLandTransportMoreMapper.insert(orderMore);
-        //    }
-        //
-        //    //托运承运企业
-        //    saveLogisticsOrderUnit(orderGeneralTransportReq, orderId);
-        //    //如果地址大于2  就是3 那就是多装卸类型
-        //    int addressTotalSize =  unLoadAddressSize + loadAddressSize;
-        //
-        //    if (addressTotalSize > 2) {
-        //        updateWrapper.set(KwOrder::getTypeHandling, AddressLoadOrUnLoadHandlingEnum.MORE.getCode());
-        //    }
-        //    orderGeneralTransportMapper.update(null, updateWrapper);
-        //}
-        ////新增订单操作记录
-        //KwOrderUsualLandTransportTrack kwOrderUsualLandTransportTrack = new KwOrderUsualLandTransportTrack();
-        //kwOrderUsualLandTransportTrack.setOrderId(orderId);
-        //kwOrderUsualLandTransportTrack.setActionNote("订单已创建");
-        //kwOrderUsualLandTransportTrack.setStatus(OrderStatusEnum.UNDER_REVIEW.getCode());  //审核中
-        //kwOrderUsualLandTransportTrackMapper.insert(kwOrderUsualLandTransportTrack);
-        //
-        //
-        //return true;
-    }
-
-    public void orderActionRecordSave(Long orderId, String actionNote, Integer orderStatus)
-    {
-        String loginActionName = "10000";
-        //新增订单操作记录
-        KwOrderCarLandTransportTrack kwOrderCarLandTransportTrack = new KwOrderCarLandTransportTrack();
-        kwOrderCarLandTransportTrack.setOrderId(orderId);
-        kwOrderCarLandTransportTrack.setActionNote(actionNote);
-        kwOrderCarLandTransportTrack.setStatus(orderStatus);  //审核中
-        kwOrderCarLandTransportTrack.setCreateBy(loginActionName);  //操作人
-        kwOrderCarLandTransportTrackMapper.insert(kwOrderCarLandTransportTrack);
-    }
-
-    public void goodsDefInsert(AddLogisticsOrderParam addLogisticsOrderParam , String orderId)
-    {
-        KwOrderCarLandTransportDefGoods kwOrderCarLandTransportPer = BeanUtils.copyProperties(addLogisticsOrderParam.getTransportPer(), KwOrderCarLandTransportDefGoods.class);
-        kwOrderCarLandTransportPer.setOrderId(Long.valueOf(orderId));
-        kwOrderCarLandTransportPer.setRationalLoss(addLogisticsOrderParam.getDefGoods().getRationalLoss());
-        kwOrderCarLandTransportPer.setDedPrice(addLogisticsOrderParam.getDefGoods().getDedPrice());
-        kwOrderCarLandTransportDefGoodsMapper.insert(kwOrderCarLandTransportPer);
-    }
-
-    public void perInsert(AddLogisticsOrderParam addLogisticsOrderParam , String orderId)
-    {
-        KwOrderCarLandTransportPer kwOrderCarLandTransportPer = BeanUtils.copyProperties(addLogisticsOrderParam.getTransportPer(), KwOrderCarLandTransportPer.class);
-        kwOrderCarLandTransportPer.setOrderId(Long.valueOf(orderId));
-        kwOrderCarLandTransportPerMapper.insert(kwOrderCarLandTransportPer);
-
-    }
-
-    /**
-    * @Description: 订单新增
-    * @Author: Lt
-    * @Date: 2024/4/17 15:18
-    */
-    public void orderInsert(AddLogisticsOrderParam addLogisticsOrderParam, Long orderId, String orderNo, Integer orderStatus)
-    {
-        KwCarOrder kwCarOrder = BeanUtils.copyProperties(addLogisticsOrderParam, KwCarOrder.class);
-        kwCarOrder.setId(String.valueOf(orderId));
-        kwCarOrder.setOrderNo(orderNo);
-        kwCarOrder.setPids(String.valueOf(orderId));
-        kwCarOrder.setOrderSource(OrderSourceEnum.SELF_BUILD_CAR_LAND_ORDER.getCode());
-        kwCarOrder.setTypeHandling(LoadOrUnLoadHandlingEnum.SINGLE.getCode());
-        kwCarOrder.setStatus(orderStatus);
-        String tenantId = TenantUtil.getTenant();
-        kwCarOrder.setTenantId(tenantId);
-        //  --
-        kwCarOrder.setGoodsType(1);
-        kwCarOrder.setUnit("1");
-        kwCarOrder.setCreateBy("admin");
-        kwCarOrderMapper.insert(kwCarOrder);
-    }
-
-    /**
-    * @Description: 更多新增
-    * @Author: Lt
-    * @Date: 2024/4/17 15:19
-    */
-    public void moreInsert(AddLogisticsOrderParam addLogisticsOrderParam, String orderId)
-    {
-        KwOrderCarLandTransportMoreReq more = addLogisticsOrderParam.getMore();
-        KwOrderCarLandTransportMore kwCarOrderMore = BeanUtils.copyProperties(more, KwOrderCarLandTransportMore.class);
-        kwCarOrderMore.setOrderId(orderId);
-        kwOrderCarLandTransportMoreMapper.insert(kwCarOrderMore);
-    }
-
-    /**
-    * @Description: 路径新增
-    * @Author: Lt
-    * @Date: 2024/4/17 15:19
-    */
-    public void pathInsert(AddLogisticsOrderParam addLogisticsOrderParam, String orderId)
-    {
-        List<KwOrderCarLandTransportPathDto> pathList = addLogisticsOrderParam.getPathList();
-        ArrayList<KwOrderCarLandTransportPath> objects = new ArrayList<>();
-
-        int remainNum = 0;   //剩余代运量    清单数量
-
-        ArrayList<KwOrderCarLandTransportPathGoods> goodsNumListArray = new ArrayList<>();
-        ArrayList<String> goodsNameList = new ArrayList<>();    //轿运
-        for (KwOrderCarLandTransportPathDto e : pathList) {
-            KwOrderCarLandTransportPath path = BeanUtils.copyProperties(e, KwOrderCarLandTransportPath.class);
-            path.setOrderId(orderId); // 设置orderId
-            path.setUnloadAddressId(e.getUnloadAddressId());
-            path.setBillMode(e.getBillingMode());
-            objects.add(path);
-            int insert = kwOrderCarLandTransportPathMapper.insert(path);
-
-            //存储成功
-            if (insert > 0) {
-                if (!ObjectUtils.isEmpty(e.getGoodsList())) {
-                    GoodsListDto goodsList = e.getGoodsList();
-                    if (CollectionUtils.isNotEmpty(goodsList.getChildren())) {
-                        List<GoodsListDetailDto> goodsNumList = goodsList.getChildren();
-                        for (GoodsListDetailDto goodsNum : goodsNumList) {
-                            KwOrderCarLandTransportPathGoods kwOrderCarLandTransportPathGoods = new KwOrderCarLandTransportPathGoods();
-                            kwOrderCarLandTransportPathGoods.setId(new IdWorker(1L).nextId());
-                            kwOrderCarLandTransportPathGoods.setCarPathId(path.getId());
-                            kwOrderCarLandTransportPathGoods.setGoodsId(goodsList.getGoodsId());
-                            kwOrderCarLandTransportPathGoods.setGoodsName(goodsList.getGoodsName());
-                            kwOrderCarLandTransportPathGoods.setGoodsNum(goodsNum.getGoodsNum());
-                            goodsNumListArray.add(kwOrderCarLandTransportPathGoods);
-                            goodsNameList.add(goodsList.getGoodsName());
-                            remainNum++;
-                        }
-                    }
-
-                }
-            }
-        }
-        String result = goodsNameList.stream()
-                .distinct() // 去除重复项
-                .collect(Collectors.joining(",")); // 转换为逗号分隔的字符串
-
-        KwCarOrder kwCarOrder = new KwCarOrder();
-        kwCarOrder.setId(orderId).setGoodsName(result).setRemainNum((double) remainNum).setRemainAllocation((double) remainNum);
-        kwCarOrderMapper.updateById(kwCarOrder);
-        if (CollectionUtils.isNotEmpty(goodsNumListArray)) {
-            kwOrderCarLandTransportPathGoodsMapper.insertBatch(goodsNumListArray);
-        }
-    }
-
-
-
-
-    /**
-     * 校验请求参数
-     *
-     * @param addLogisticsOrderParam
-     */
-    private void checkCreateLogisticOrderParam(AddLogisticsOrderParam addLogisticsOrderParam) {
-
-        if (!ObjectUtils.isEmpty(addLogisticsOrderParam.getTaxRate())) {
-            if (addLogisticsOrderParam.getTaxRate().compareTo(new BigDecimal(Global.NUMERICAL_ZERO)) < 0) {
-                throw new RuntimeException("税率填写格式错误!");
-            }
-        }
-        if (!ObjectUtils.isEmpty(addLogisticsOrderParam.getLoss())) {
-            if (addLogisticsOrderParam.getLoss().compareTo(new BigDecimal(Global.NUMERICAL_ZERO)) < 0) {
-                throw new RuntimeException("合理损耗填写格式错误!");
-            }
-        }
-        if (!ObjectUtils.isEmpty(addLogisticsOrderParam.getGoodsPrice())) {
-            if (addLogisticsOrderParam.getGoodsPrice().compareTo(new BigDecimal(Global.NUMERICAL_ZERO)) < 0) {
-                throw new RuntimeException("扣亏货值填写格式错误!");
-            }
-        }
-    }
-}
+package com.sckw.car.service;
+
+import com.sckw.car.entity.*;
+import com.sckw.car.entity.req.*;
+import com.sckw.car.enums.LoadOrUnLoadHandlingEnum;
+import com.sckw.car.mapper.*;
+import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.enums.OrderCarStatusEnum;
+import com.sckw.core.model.enums.OrderSourceEnum;
+import com.sckw.core.utils.*;
+import com.sckw.redis.utils.GenerateOrderIdUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-04-16
+ */
+@Service
+public class CarTransportService {
+
+    @Autowired
+    GenerateOrderIdUtil generateOrderIdUtil;
+
+    @Autowired
+    KwCarOrderMapper kwCarOrderMapper;
+
+    @Autowired
+    KwOrderCarLandTransportMoreMapper kwOrderCarLandTransportMoreMapper;
+
+    @Autowired
+    KwOrderCarLandTransportPathMapper kwOrderCarLandTransportPathMapper;
+
+    @Autowired
+    KwOrderCarLandTransportPathGoodsMapper kwOrderCarLandTransportPathGoodsMapper;
+
+    @Autowired
+    KwOrderCarLandTransportPerMapper kwOrderCarLandTransportPerMapper;
+
+    @Autowired
+    KwOrderCarLandTransportDefGoodsMapper kwOrderCarLandTransportDefGoodsMapper;
+
+    @Autowired
+    KwOrderCarLandTransportTrackMapper kwOrderCarLandTransportTrackMapper;
+
+    @Transactional
+    public Boolean carTransportAdd(AddLogisticsOrderParam addLogisticsOrderParam)
+    {
+
+        Integer orderStatus = OrderCarStatusEnum.WAIT_TRANSPORT.getCode();
+        //格式验证
+        checkCreateLogisticOrderParam(addLogisticsOrderParam);
+        Long orderId = new IdWorker(Global.NUMERICAL_ONE).nextId();
+        String orderNo = generateOrderIdUtil.getOrderNo("O");
+        //订单存储
+        orderInsert(addLogisticsOrderParam,orderId, orderNo, orderStatus);
+
+        //更多信息
+        moreInsert(addLogisticsOrderParam, String.valueOf(orderId));
+
+        //路径信息存储
+        pathInsert(addLogisticsOrderParam, String.valueOf(orderId));
+
+        // 履约信息存储
+        perInsert(addLogisticsOrderParam, String.valueOf(orderId));
+
+        // 扣亏货新增
+        goodsDefInsert(addLogisticsOrderParam, String.valueOf(orderId));
+
+        orderActionRecordSave(orderId, "轿运新增", orderStatus);
+
+        return true;
+
+        //kwOrderUsualLandTransportGoodsReq goodsReq = addLogisticsOrderParam.getGoodsReq();
+        //KwOrderUsualTransportPerReq perReq = addLogisticsOrderParam.getPerReq();
+        //KwOrderUsualLandTransportDefGoodsReq defGoods = addLogisticsOrderParam.getDefGoods();
+        //KwOrderUsualLandTransportMoreReq usualMore = addLogisticsOrderParam.getOrderMore();
+        //
+        //KwOrder kwOrder = BeanUtil.copyProperties(orderGeneralTransportReq, KwOrder.class);
+        //long id = new IdWorker(Global.NUMERICAL_ONE).nextId();
+        //kwOrder.setId(id);
+        //kwOrder.setOrderNo("O"+ id);//生成订单号
+        //kwOrder.setOrderSource(OrderSourceEnum.SELF_BUILD_NORMAL_LAND_ORDER.getCode()); //普货运输
+        //kwOrder.setPids(String.valueOf(id));
+        //int insert = orderGeneralTransportMapper.insert(kwOrder);
+        //long orderId = kwOrder.getId(); // 获取订单ID
+        //String orderNo = kwOrder.getOrderNo(); // 获取订单ID
+        //
+        //if (insert > 0) {
+        //    LambdaUpdateWrapper<KwOrder> updateWrapper = new LambdaUpdateWrapper<>();
+        //    updateWrapper.eq(KwOrder::getId, kwOrder.getId());
+        //
+        //    int loadAddressSize = 0;
+        //    int unLoadAddressSize = 0;
+        //    //装载地址新增
+        //    if(!loadAddressInfo.isEmpty()) {
+        //        addTransportAddresses(loadAddressInfo, orderId, orderNo, AddressTypeEnum.LOAD_ADDRESS.getCode());
+        //        loadAddressSize = loadAddressInfo.size();
+        //    }
+        //    //卸货地址新增
+        //    if(!unLoadAddressInfo.isEmpty()) {
+        //        addTransportAddresses(loadAddressInfo, orderId, orderNo, AddressTypeEnum.UNLOAD_ADDRESS.getCode());
+        //        unLoadAddressSize = unLoadAddressInfo.size();
+        //    }
+        //    //商品信息新增
+        //    if(com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull(goodsReq)) {
+        //        KwOrderUsualLandTransportGoods goods = BeanUtil.copyProperties(goodsReq, KwOrderUsualLandTransportGoods.class);
+        //        // 在 lambda 表达式中对 address 进行处理，例如赋值
+        //        goods.setOrderId(orderId);
+        //        goods.setOrderNo(orderNo);
+        //        orderGeneralTransportGoodsMapper.insert(goods);
+        //        updateWrapper.set(KwOrder::getGoodsId, goods.getGoodsId());
+        //        updateWrapper.set(KwOrder::getGoodsName, goods.getGoodsName());
+        //        updateWrapper.set(KwOrder::getGoodsType, goods.getGoodsType());
+        //        updateWrapper.set(KwOrder::getGoodsUnit, goods.getGoodsUnit());
+        //    }
+        //    //履约信息新增
+        //    if(com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull(perReq)) {
+        //        KwOrderUsualTransportPer perReqList = BeanUtil.copyProperties(perReq, KwOrderUsualTransportPer.class);
+        //        // 在 lambda 表达式中对 address 进行处理，例如赋值
+        //        perReqList.setOrderId(orderId);
+        //        orderGeneralTransportPerMapper.insert(perReqList);
+        //    }
+        //    //扣亏货信息
+        //    if(com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull(defGoods)) {
+        //        KwOrderUsualLandTransportDefGoods defGoodsParam = BeanUtil.copyProperties(defGoods, KwOrderUsualLandTransportDefGoods.class);
+        //        // 在 lambda 表达式中对 address 进行处理，例如赋值
+        //        defGoodsParam.setOrderId(orderId);
+        //        kwOrderUsualLandTransportDefGoodsMapper.insert(defGoodsParam);
+        //    }
+        //    //更多信息
+        //    if(com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull(usualMore)) {
+        //        KwOrderUsualLandTransportMore orderMore = BeanUtil.copyProperties(usualMore, KwOrderUsualLandTransportMore.class);
+        //        // 在 lambda 表达式中对 address 进行处理，例如赋值
+        //        orderMore.setOrderId(orderId);
+        //        kwOrderUsualLandTransportMoreMapper.insert(orderMore);
+        //    }
+        //
+        //    //托运承运企业
+        //    saveLogisticsOrderUnit(orderGeneralTransportReq, orderId);
+        //    //如果地址大于2  就是3 那就是多装卸类型
+        //    int addressTotalSize =  unLoadAddressSize + loadAddressSize;
+        //
+        //    if (addressTotalSize > 2) {
+        //        updateWrapper.set(KwOrder::getTypeHandling, AddressLoadOrUnLoadHandlingEnum.MORE.getCode());
+        //    }
+        //    orderGeneralTransportMapper.update(null, updateWrapper);
+        //}
+        ////新增订单操作记录
+        //KwOrderUsualLandTransportTrack kwOrderUsualLandTransportTrack = new KwOrderUsualLandTransportTrack();
+        //kwOrderUsualLandTransportTrack.setOrderId(orderId);
+        //kwOrderUsualLandTransportTrack.setActionNote("订单已创建");
+        //kwOrderUsualLandTransportTrack.setStatus(OrderStatusEnum.UNDER_REVIEW.getCode());  //审核中
+        //kwOrderUsualLandTransportTrackMapper.insert(kwOrderUsualLandTransportTrack);
+        //
+        //
+        //return true;
+    }
+
+    public void orderActionRecordSave(Long orderId, String actionNote, Integer orderStatus)
+    {
+        String loginActionName = "10000";
+        //新增订单操作记录
+        KwOrderCarLandTransportTrack kwOrderCarLandTransportTrack = new KwOrderCarLandTransportTrack();
+        kwOrderCarLandTransportTrack.setOrderId(orderId);
+        kwOrderCarLandTransportTrack.setActionNote(actionNote);
+        kwOrderCarLandTransportTrack.setStatus(orderStatus);  //审核中
+        kwOrderCarLandTransportTrack.setCreateBy(loginActionName);  //操作人
+        kwOrderCarLandTransportTrackMapper.insert(kwOrderCarLandTransportTrack);
+    }
+
+    public void goodsDefInsert(AddLogisticsOrderParam addLogisticsOrderParam , String orderId)
+    {
+        KwOrderCarLandTransportDefGoods kwOrderCarLandTransportPer = BeanUtils.copyProperties(addLogisticsOrderParam.getTransportPer(), KwOrderCarLandTransportDefGoods.class);
+        kwOrderCarLandTransportPer.setOrderId(Long.valueOf(orderId));
+        kwOrderCarLandTransportPer.setRationalLoss(addLogisticsOrderParam.getDefGoods().getRationalLoss());
+        kwOrderCarLandTransportPer.setDedPrice(addLogisticsOrderParam.getDefGoods().getDedPrice());
+        kwOrderCarLandTransportDefGoodsMapper.insert(kwOrderCarLandTransportPer);
+    }
+
+    public void perInsert(AddLogisticsOrderParam addLogisticsOrderParam , String orderId)
+    {
+        KwOrderCarLandTransportPer kwOrderCarLandTransportPer = BeanUtils.copyProperties(addLogisticsOrderParam.getTransportPer(), KwOrderCarLandTransportPer.class);
+        kwOrderCarLandTransportPer.setOrderId(Long.valueOf(orderId));
+        kwOrderCarLandTransportPerMapper.insert(kwOrderCarLandTransportPer);
+
+    }
+
+    /**
+    * @Description: 订单新增
+    * @Author: Lt
+    * @Date: 2024/4/17 15:18
+    */
+    public void orderInsert(AddLogisticsOrderParam addLogisticsOrderParam, Long orderId, String orderNo, Integer orderStatus)
+    {
+        KwCarOrder kwCarOrder = BeanUtils.copyProperties(addLogisticsOrderParam, KwCarOrder.class);
+        kwCarOrder.setId(String.valueOf(orderId));
+        kwCarOrder.setOrderNo(orderNo);
+        kwCarOrder.setPids(String.valueOf(orderId));
+        kwCarOrder.setOrderSource(OrderSourceEnum.SELF_BUILD_CAR_LAND_ORDER.getCode());
+        kwCarOrder.setTypeHandling(LoadOrUnLoadHandlingEnum.SINGLE.getCode());
+        kwCarOrder.setStatus(orderStatus);
+        String tenantId = TenantUtil.getTenant();
+        kwCarOrder.setTenantId(tenantId);
+        //  --
+        kwCarOrder.setGoodsType(1);
+        kwCarOrder.setUnit("1");
+        kwCarOrder.setCreateBy("admin");
+        kwCarOrderMapper.insert(kwCarOrder);
+    }
+
+    /**
+    * @Description: 更多新增
+    * @Author: Lt
+    * @Date: 2024/4/17 15:19
+    */
+    public void moreInsert(AddLogisticsOrderParam addLogisticsOrderParam, String orderId)
+    {
+        KwOrderCarLandTransportMoreReq more = addLogisticsOrderParam.getMore();
+        KwOrderCarLandTransportMore kwCarOrderMore = BeanUtils.copyProperties(more, KwOrderCarLandTransportMore.class);
+        kwCarOrderMore.setOrderId(orderId);
+        kwOrderCarLandTransportMoreMapper.insert(kwCarOrderMore);
+    }
+
+    /**
+    * @Description: 路径新增
+    * @Author: Lt
+    * @Date: 2024/4/17 15:19
+    */
+    public void pathInsert(AddLogisticsOrderParam addLogisticsOrderParam, String orderId)
+    {
+        List<KwOrderCarLandTransportPathDto> pathList = addLogisticsOrderParam.getPathList();
+        ArrayList<KwOrderCarLandTransportPath> objects = new ArrayList<>();
+
+        int remainNum = 0;   //剩余代运量    清单数量
+
+        ArrayList<KwOrderCarLandTransportPathGoods> goodsNumListArray = new ArrayList<>();
+        ArrayList<String> goodsNameList = new ArrayList<>();    //轿运
+        for (KwOrderCarLandTransportPathDto e : pathList) {
+            KwOrderCarLandTransportPath path = BeanUtils.copyProperties(e, KwOrderCarLandTransportPath.class);
+            path.setOrderId(orderId); // 设置orderId
+            path.setUnloadAddressId(e.getUnloadAddressId());
+            path.setBillMode(e.getBillingMode());
+            objects.add(path);
+            int insert = kwOrderCarLandTransportPathMapper.insert(path);
+
+            //存储成功
+            if (insert > 0) {
+                if (!ObjectUtils.isEmpty(e.getGoodsList())) {
+                    GoodsListDto goodsList = e.getGoodsList();
+                    if (CollectionUtils.isNotEmpty(goodsList.getChildren())) {
+                        List<GoodsListDetailDto> goodsNumList = goodsList.getChildren();
+                        for (GoodsListDetailDto goodsNum : goodsNumList) {
+                            KwOrderCarLandTransportPathGoods kwOrderCarLandTransportPathGoods = new KwOrderCarLandTransportPathGoods();
+                            kwOrderCarLandTransportPathGoods.setId(new IdWorker(1L).nextId());
+                            kwOrderCarLandTransportPathGoods.setCarPathId(path.getId());
+                            kwOrderCarLandTransportPathGoods.setGoodsId(goodsList.getGoodsId());
+                            kwOrderCarLandTransportPathGoods.setGoodsName(goodsList.getGoodsName());
+                            kwOrderCarLandTransportPathGoods.setGoodsNum(goodsNum.getGoodsNum());
+                            goodsNumListArray.add(kwOrderCarLandTransportPathGoods);
+                            goodsNameList.add(goodsList.getGoodsName());
+                            remainNum++;
+                        }
+                    }
+
+                }
+            }
+        }
+        String result = goodsNameList.stream()
+                .distinct() // 去除重复项
+                .collect(Collectors.joining(",")); // 转换为逗号分隔的字符串
+
+        KwCarOrder kwCarOrder = new KwCarOrder();
+        kwCarOrder.setId(orderId).setGoodsName(result).setRemainNum((double) remainNum).setRemainAllocation((double) remainNum);
+        kwCarOrderMapper.updateById(kwCarOrder);
+        if (CollectionUtils.isNotEmpty(goodsNumListArray)) {
+            kwOrderCarLandTransportPathGoodsMapper.insertBatch(goodsNumListArray);
+        }
+    }
+
+
+
+
+    /**
+     * 校验请求参数
+     *
+     * @param addLogisticsOrderParam
+     */
+    private void checkCreateLogisticOrderParam(AddLogisticsOrderParam addLogisticsOrderParam) {
+
+        if (!ObjectUtils.isEmpty(addLogisticsOrderParam.getTaxRate())) {
+            if (addLogisticsOrderParam.getTaxRate().compareTo(new BigDecimal(Global.NUMERICAL_ZERO)) < 0) {
+                throw new RuntimeException("税率填写格式错误!");
+            }
+        }
+        if (!ObjectUtils.isEmpty(addLogisticsOrderParam.getLoss())) {
+            if (addLogisticsOrderParam.getLoss().compareTo(new BigDecimal(Global.NUMERICAL_ZERO)) < 0) {
+                throw new RuntimeException("合理损耗填写格式错误!");
+            }
+        }
+        if (!ObjectUtils.isEmpty(addLogisticsOrderParam.getGoodsPrice())) {
+            if (addLogisticsOrderParam.getGoodsPrice().compareTo(new BigDecimal(Global.NUMERICAL_ZERO)) < 0) {
+                throw new RuntimeException("扣亏货值填写格式错误!");
+            }
+        }
+    }
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/service/KwWayBillService.java

@@ -1,272 +1,272 @@
-package com.sckw.car.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.sckw.car.entity.*;
-import com.sckw.car.entity.req.*;
-import com.sckw.car.entity.res.KwOrderWaybillDetailRes;
-import com.sckw.car.enums.WaybillOrderStatusEnum;
-import com.sckw.car.enums.WaybillStatusEnums;
-import com.sckw.car.mapper.*;
-import com.sckw.core.web.response.HttpResult;
-import com.sckw.redis.utils.GenerateOrderIdUtil;
-import com.sckw.core.model.constant.Global;
-import com.sckw.core.model.enums.OrderCarStatusEnum;
-import com.sckw.core.utils.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @desc: 运单服务
- * @author: Lt
- * @date: 2024-04-18
- */
-@Service
-public class KwWayBillService {
-
-    @Autowired
-    KwCarWaybillOrderMapper kwCarWaybillOrderMapper;
-
-    @Autowired
-    KwCarOrderMapper kwOrderMapper;
-
-    @Autowired
-    GenerateOrderIdUtil generateOrderIdUtil;
-
-    @Autowired
-    KwOrderCarWaybillOrderDispatchMapper kwOrderCarWaybillOrderDispatchMapper;
-
-    @Autowired
-    KwOrderCarWaybillOrderDispatchAssignMapper kwOrderCarWaybillOrderDispatchAssignMapper;
-
-    @Autowired
-    KwOrderCarLandTransportPathMapper kwOrderCarLandTransportPathMapper;
-
-    @Autowired
-    KwOrderCarWaybillOrderDispatchAddressMapper kwOrderCarWaybillOrderDispatchAddressMapper;
-
-    @Autowired
-    KwOrderCarWaybillTransportPathGoodsMapper kwOrderCarWaybillTransportPathGoodsMapper;
-
-    public HttpResult sendCarInsert(KwOrderSendCarParam kwOrderSendCarParam)
-    {
-        return sendCarInsert(kwOrderSendCarParam, WaybillOrderStatusEnum.ONE.getCode());
-    }
-
-    /**
-     * @Description: 派车草稿
-     * @Author: Lt
-     * @Date: 2024/4/19 0019 17:24
-     */
-    public HttpResult sendCarDraft(KwOrderSendCarParam kwOrderSendCarParam)
-    {
-        return sendCarInsert(kwOrderSendCarParam, WaybillOrderStatusEnum.TWO.getCode());
-    }
-
-    /**
-    * @Description: 订单派车
-    * @Author: Lt
-    * @Date: 2024/4/19 17:24
-    */
-    @Transactional(rollbackFor = Exception.class)
-    public HttpResult sendCarInsert(KwOrderSendCarParam kwOrderSendCarParam, Integer status)
-    {
-        try{
-            //查询订单
-            LambdaQueryWrapper<KwCarOrder> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            objectLambdaQueryWrapper.eq(KwCarOrder::getId, kwOrderSendCarParam.getOrderId())
-                    .eq(KwCarOrder::getDelFlag, Global.NUMERICAL_ZERO);
-            KwCarOrder kwCarOrder = kwOrderMapper.selectOne(objectLambdaQueryWrapper);
-            if (ObjectUtils.isEmpty(kwCarOrder)) {
-                throw new RuntimeException("当前订单号不存在");
-            }
-            //    /* 添加派车任务 */
-            saveCreateDispatch(kwOrderSendCarParam);
-
-            //}
-        }catch (Exception e){
-            return HttpResult.error(e.getMessage());
-        }
-
-        return HttpResult.ok("派车成功");
-    }
-
-
-    /**
-    * @Description: 添加派车任务
-    * @Author: Lt
-    * @Date: 2024/4/19 15:47
-    */
-    public Boolean saveCreateDispatch(KwOrderSendCarParam kwOrderSendCarParam)
-    {
-
-        String orderId = kwOrderSendCarParam.getOrderId();   //订单Id
-        ArrayList<KwCarWaybillOrder> objectsList = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(kwOrderSendCarParam.getDispatch())) {
-            //添加派车任务 (一个任务一个运单)
-            List<kwWaybillOrderReq> dispatch = kwOrderSendCarParam.getDispatch();
-
-            dispatch.forEach(e -> {
-                KwCarWaybillOrder kwWaybillOrder = new KwCarWaybillOrder();
-                String dispatchNo = generateOrderIdUtil.getOrderNo("T");
-                Long waybillId = new IdWorker(Global.NUMERICAL_ONE).nextId();
-                kwWaybillOrder.setId(String.valueOf(waybillId));
-                kwWaybillOrder.setOrderId(orderId);
-                kwWaybillOrder.setTOrderNo(dispatchNo);
-                kwWaybillOrder.setType(Global.NUMERICAL_ONE);
-                kwWaybillOrder.setTruckId(e.getTruckId());
-                kwWaybillOrder.setTruckNo(e.getTruckNo());
-                kwWaybillOrder.setDriverId(e.getDriverId());
-                kwWaybillOrder.setDriverName(e.getDriverName());
-                kwWaybillOrder.setDriverPhone(e.getDriverPhone());
-                kwWaybillOrder.setDriverIdcard(e.getDriverIdcard());
-                kwWaybillOrder.setRemark(e.getRemark());
-                kwWaybillOrder.setStatus(WaybillStatusEnums.ONE.getCode());
-                kwWaybillOrder.setTType(Global.NUMERICAL_TWO);  //轿运
-                kwWaybillOrder.setUnit(Global.NUMERICAL_ZERO);  //轿运
-                kwWaybillOrder.setEntrustAmount(BigDecimal.ZERO);  //轿运
-                kwWaybillOrder.setLoadAmount(BigDecimal.ZERO);  //轿运
-                kwWaybillOrder.setUnloadAmount(BigDecimal.ZERO);  //轿运
-                kwWaybillOrder.setDeficitAmount(BigDecimal.ZERO);  //轿运
-                kwWaybillOrder.setCreateBy(kwOrderSendCarParam.getCreateBy() == null ? "admin" : kwOrderSendCarParam.getCreateBy());  //轿运
-                objectsList.add(kwWaybillOrder);
-                if (CollectionUtils.isNotEmpty(e.getGoodsList())) {
-                    /* 分配任务清单添加 */
-                    int i = saveCreateDispatchAssign(e.getGoodsList(), waybillId, orderId);
-                    kwWaybillOrder.setEntrustAmount(BigDecimal.valueOf(i));
-                }
-                if (CollectionUtils.isNotEmpty(e.getPathAddress())) {
-                    /* 分配任务清单地址添加 */
-                    saveCreateDispatchAddress(e.getPathAddress(), String.valueOf(waybillId), orderId);
-                }
-            });
-        }
-        kwCarWaybillOrderMapper.insertBatch(objectsList);
-        return true;
-
-    }
-    
-    /**
-    * @Description: 任务清单添加
-    * @Author: Lt
-    * @Date: 2024/4/19 16:16
-    */
-    public int saveCreateDispatchAssign(List<KwOrderCarWaybillOrderDispatchAssignReq> goodsLists, Long waybillId, String orderId)
-    {
-        ArrayList<KwOrderCarWaybillTransportPathGoods> insertGoodsLists = new ArrayList<>();
-        String goodsName;
-        String goodsId;
-        int remainGoodsNum = 0;
-        for (KwOrderCarWaybillOrderDispatchAssignReq goodsList : goodsLists) {
-            if (goodsList == null) {
-                continue;
-            }
-            goodsName = goodsList.getGoodsName();
-            goodsId = goodsList.getGoodsId();
-            if (CollectionUtils.isNotEmpty(goodsList.getChildren())){
-                for (InventoryNumDto child : goodsList.getChildren()) {
-                    KwOrderCarWaybillTransportPathGoods kwOrderCarWaybillTransportPathGoods = new KwOrderCarWaybillTransportPathGoods();
-                    kwOrderCarWaybillTransportPathGoods.setOrderId(orderId);
-                    kwOrderCarWaybillTransportPathGoods.setGoodsId(goodsId);
-                    kwOrderCarWaybillTransportPathGoods.setGoodsNum(child.getGoodsNum());
-                    kwOrderCarWaybillTransportPathGoods.setGoodsName(goodsName);
-                    kwOrderCarWaybillTransportPathGoods.setWaybillId(waybillId);
-                    kwOrderCarWaybillTransportPathGoods.setId(new IdWorker(1L).nextId());
-                    insertGoodsLists.add(kwOrderCarWaybillTransportPathGoods);
-                    remainGoodsNum += 1;
-                }
-            }
-        }
-        kwOrderCarWaybillTransportPathGoodsMapper.insertBatch(insertGoodsLists);
-        KwCarOrder kwCarOrder = kwOrderMapper.selectById(orderId);
-        if (kwCarOrder.getRemainAllocation() < remainGoodsNum) {
-            throw  new RuntimeException("剩余待分配量不足");
-        }
-        double v = kwCarOrder.getRemainAllocation() - remainGoodsNum;
-        kwCarOrder.setRemainAllocation(v);
-        kwCarOrder.setStatus(OrderCarStatusEnum.IN_TRANSIT.getCode());
-        kwOrderMapper.updateById(kwCarOrder);
-
-        KwCarWaybillOrder kwCarWaybillOrder = new KwCarWaybillOrder();
-        kwCarWaybillOrder.setId(String.valueOf(waybillId));
-        kwCarWaybillOrder.setEntrustAmount(BigDecimal.valueOf(remainGoodsNum));
-        kwCarWaybillOrderMapper.updateById(kwCarWaybillOrder);
-        return remainGoodsNum;
-    }
-
-    public void saveCreateDispatchAddress(List<KwOrderCarWaybillOrderDispatchAddressReq> pathList, String waybillId, String orderId)
-    {
-        ArrayList<KwOrderCarWaybillOrderDispatchAddress> addressLists = new ArrayList<>();
-        pathList.forEach(f -> {
-            KwOrderCarWaybillOrderDispatchAddress kwOrderCarWaybillOrderDispatchAddress = BeanUtils.copyProperties(f, KwOrderCarWaybillOrderDispatchAddress.class);
-            Long id = new IdWorker(Global.NUMERICAL_ONE).nextId();
-            kwOrderCarWaybillOrderDispatchAddress.setId(id);
-            kwOrderCarWaybillOrderDispatchAddress.setOrderId(orderId);
-            kwOrderCarWaybillOrderDispatchAddress.setWaybillId(waybillId);
-            kwOrderCarWaybillOrderDispatchAddress.setName(f.getName());
-            kwOrderCarWaybillOrderDispatchAddress.setAddressId(f.getAddressId());
-            kwOrderCarWaybillOrderDispatchAddress.setAddressType(f.getAddressType());
-            kwOrderCarWaybillOrderDispatchAddress.setUnit(f.getUnit());
-            kwOrderCarWaybillOrderDispatchAddress.setEntrustAmount(f.getEntrustAmount());
-            kwOrderCarWaybillOrderDispatchAddress.setSort(f.getSort());
-            addressLists.add(kwOrderCarWaybillOrderDispatchAddress);
-        });
-        kwOrderCarWaybillOrderDispatchAddressMapper.insertBatch(addressLists);
-
-    }
-
-    @Transactional
-    public HttpResult completeOrder(KwOrderCarCompleteParam kwOrderCarCompleteParam) {
-        Long orderId = kwOrderCarCompleteParam.getOrderId();
-        List<KwOrderCompletePathDto> pathList = kwOrderCarCompleteParam.getPath();
-
-        BigDecimal totalMultiply = BigDecimal.ZERO;
-
-        List<KwOrderCarLandTransportPath> pathsToUpdate = new ArrayList<>();
-        for (KwOrderCompletePathDto e : pathList) {
-            KwOrderCarLandTransportPath pathObj = kwOrderCarLandTransportPathMapper.selectById(e.getId());
-            if (pathObj != null) {
-                /* 结算量*里程价 */
-                BigDecimal multiply = e.getSettleAmount().multiply(pathObj.getTransportPrice());
-
-                totalMultiply = totalMultiply.add(multiply);
-
-                KwOrderCarLandTransportPath pathToUpdate = new KwOrderCarLandTransportPath();
-                pathToUpdate.setId(pathObj.getId());
-                pathToUpdate.setSettlementAmount(multiply);
-                pathsToUpdate.add(pathToUpdate);
-            }
-        }
-
-        // 执行批量更新
-        if (!pathsToUpdate.isEmpty()) {
-            kwOrderCarLandTransportPathMapper.batchUpdateSettlementAmount(pathsToUpdate);
-        }
-
-        // 更新订单状态
-        KwCarOrder kwCarOrder = new KwCarOrder();
-        kwCarOrder.setId(String.valueOf(orderId));
-        kwCarOrder.setStatus(OrderCarStatusEnum.FINISHED.getCode());
-        kwOrderMapper.updateById(kwCarOrder);
-
-        // TODO 添加操作记录
-
-        return HttpResult.ok("完结成功");
-    }
-
-    /**
-    * @Description: 运单详情
-    * @Author: Lt
-    * @Date: 2024/4/22 10:31
-    */
-    public KwOrderWaybillDetailRes waybillDetail(String orderId)
-    {
-        //查询运单详情
-        return kwCarWaybillOrderMapper.selectWaybillDetailById(orderId);
-    }
-}
+package com.sckw.car.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sckw.car.entity.*;
+import com.sckw.car.entity.req.*;
+import com.sckw.car.entity.res.KwOrderWaybillDetailRes;
+import com.sckw.car.enums.WaybillOrderStatusEnum;
+import com.sckw.car.enums.WaybillStatusEnums;
+import com.sckw.car.mapper.*;
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.redis.utils.GenerateOrderIdUtil;
+import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.enums.OrderCarStatusEnum;
+import com.sckw.core.utils.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @desc: 运单服务
+ * @author: Lt
+ * @date: 2024-04-18
+ */
+@Service
+public class KwWayBillService {
+
+    @Autowired
+    KwCarWaybillOrderMapper kwCarWaybillOrderMapper;
+
+    @Autowired
+    KwCarOrderMapper kwOrderMapper;
+
+    @Autowired
+    GenerateOrderIdUtil generateOrderIdUtil;
+
+    @Autowired
+    KwOrderCarWaybillOrderDispatchMapper kwOrderCarWaybillOrderDispatchMapper;
+
+    @Autowired
+    KwOrderCarWaybillOrderDispatchAssignMapper kwOrderCarWaybillOrderDispatchAssignMapper;
+
+    @Autowired
+    KwOrderCarLandTransportPathMapper kwOrderCarLandTransportPathMapper;
+
+    @Autowired
+    KwOrderCarWaybillOrderDispatchAddressMapper kwOrderCarWaybillOrderDispatchAddressMapper;
+
+    @Autowired
+    KwOrderCarWaybillTransportPathGoodsMapper kwOrderCarWaybillTransportPathGoodsMapper;
+
+    public HttpResult sendCarInsert(KwOrderSendCarParam kwOrderSendCarParam)
+    {
+        return sendCarInsert(kwOrderSendCarParam, WaybillOrderStatusEnum.ONE.getCode());
+    }
+
+    /**
+     * @Description: 派车草稿
+     * @Author: Lt
+     * @Date: 2024/4/19 0019 17:24
+     */
+    public HttpResult sendCarDraft(KwOrderSendCarParam kwOrderSendCarParam)
+    {
+        return sendCarInsert(kwOrderSendCarParam, WaybillOrderStatusEnum.TWO.getCode());
+    }
+
+    /**
+    * @Description: 订单派车
+    * @Author: Lt
+    * @Date: 2024/4/19 17:24
+    */
+    @Transactional(rollbackFor = Exception.class)
+    public HttpResult sendCarInsert(KwOrderSendCarParam kwOrderSendCarParam, Integer status)
+    {
+        try{
+            //查询订单
+            LambdaQueryWrapper<KwCarOrder> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            objectLambdaQueryWrapper.eq(KwCarOrder::getId, kwOrderSendCarParam.getOrderId())
+                    .eq(KwCarOrder::getDelFlag, Global.NUMERICAL_ZERO);
+            KwCarOrder kwCarOrder = kwOrderMapper.selectOne(objectLambdaQueryWrapper);
+            if (ObjectUtils.isEmpty(kwCarOrder)) {
+                throw new RuntimeException("当前订单号不存在");
+            }
+            //    /* 添加派车任务 */
+            saveCreateDispatch(kwOrderSendCarParam);
+
+            //}
+        }catch (Exception e){
+            return HttpResult.error(e.getMessage());
+        }
+
+        return HttpResult.ok("派车成功");
+    }
+
+
+    /**
+    * @Description: 添加派车任务
+    * @Author: Lt
+    * @Date: 2024/4/19 15:47
+    */
+    public Boolean saveCreateDispatch(KwOrderSendCarParam kwOrderSendCarParam)
+    {
+
+        String orderId = kwOrderSendCarParam.getOrderId();   //订单Id
+        ArrayList<KwCarWaybillOrder> objectsList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(kwOrderSendCarParam.getDispatch())) {
+            //添加派车任务 (一个任务一个运单)
+            List<kwWaybillOrderReq> dispatch = kwOrderSendCarParam.getDispatch();
+
+            dispatch.forEach(e -> {
+                KwCarWaybillOrder kwWaybillOrder = new KwCarWaybillOrder();
+                String dispatchNo = generateOrderIdUtil.getOrderNo("T");
+                Long waybillId = new IdWorker(Global.NUMERICAL_ONE).nextId();
+                kwWaybillOrder.setId(String.valueOf(waybillId));
+                kwWaybillOrder.setOrderId(orderId);
+                kwWaybillOrder.setTOrderNo(dispatchNo);
+                kwWaybillOrder.setType(Global.NUMERICAL_ONE);
+                kwWaybillOrder.setTruckId(e.getTruckId());
+                kwWaybillOrder.setTruckNo(e.getTruckNo());
+                kwWaybillOrder.setDriverId(e.getDriverId());
+                kwWaybillOrder.setDriverName(e.getDriverName());
+                kwWaybillOrder.setDriverPhone(e.getDriverPhone());
+                kwWaybillOrder.setDriverIdcard(e.getDriverIdcard());
+                kwWaybillOrder.setRemark(e.getRemark());
+                kwWaybillOrder.setStatus(WaybillStatusEnums.ONE.getCode());
+                kwWaybillOrder.setTType(Global.NUMERICAL_TWO);  //轿运
+                kwWaybillOrder.setUnit(Global.NUMERICAL_ZERO);  //轿运
+                kwWaybillOrder.setEntrustAmount(BigDecimal.ZERO);  //轿运
+                kwWaybillOrder.setLoadAmount(BigDecimal.ZERO);  //轿运
+                kwWaybillOrder.setUnloadAmount(BigDecimal.ZERO);  //轿运
+                kwWaybillOrder.setDeficitAmount(BigDecimal.ZERO);  //轿运
+                kwWaybillOrder.setCreateBy(kwOrderSendCarParam.getCreateBy() == null ? "admin" : kwOrderSendCarParam.getCreateBy());  //轿运
+                objectsList.add(kwWaybillOrder);
+                if (CollectionUtils.isNotEmpty(e.getGoodsList())) {
+                    /* 分配任务清单添加 */
+                    int i = saveCreateDispatchAssign(e.getGoodsList(), waybillId, orderId);
+                    kwWaybillOrder.setEntrustAmount(BigDecimal.valueOf(i));
+                }
+                if (CollectionUtils.isNotEmpty(e.getPathAddress())) {
+                    /* 分配任务清单地址添加 */
+                    saveCreateDispatchAddress(e.getPathAddress(), String.valueOf(waybillId), orderId);
+                }
+            });
+        }
+        kwCarWaybillOrderMapper.insertBatch(objectsList);
+        return true;
+
+    }
+    
+    /**
+    * @Description: 任务清单添加
+    * @Author: Lt
+    * @Date: 2024/4/19 16:16
+    */
+    public int saveCreateDispatchAssign(List<KwOrderCarWaybillOrderDispatchAssignReq> goodsLists, Long waybillId, String orderId)
+    {
+        ArrayList<KwOrderCarWaybillTransportPathGoods> insertGoodsLists = new ArrayList<>();
+        String goodsName;
+        String goodsId;
+        int remainGoodsNum = 0;
+        for (KwOrderCarWaybillOrderDispatchAssignReq goodsList : goodsLists) {
+            if (goodsList == null) {
+                continue;
+            }
+            goodsName = goodsList.getGoodsName();
+            goodsId = goodsList.getGoodsId();
+            if (CollectionUtils.isNotEmpty(goodsList.getChildren())){
+                for (InventoryNumDto child : goodsList.getChildren()) {
+                    KwOrderCarWaybillTransportPathGoods kwOrderCarWaybillTransportPathGoods = new KwOrderCarWaybillTransportPathGoods();
+                    kwOrderCarWaybillTransportPathGoods.setOrderId(orderId);
+                    kwOrderCarWaybillTransportPathGoods.setGoodsId(goodsId);
+                    kwOrderCarWaybillTransportPathGoods.setGoodsNum(child.getGoodsNum());
+                    kwOrderCarWaybillTransportPathGoods.setGoodsName(goodsName);
+                    kwOrderCarWaybillTransportPathGoods.setWaybillId(waybillId);
+                    kwOrderCarWaybillTransportPathGoods.setId(new IdWorker(1L).nextId());
+                    insertGoodsLists.add(kwOrderCarWaybillTransportPathGoods);
+                    remainGoodsNum += 1;
+                }
+            }
+        }
+        kwOrderCarWaybillTransportPathGoodsMapper.insertBatch(insertGoodsLists);
+        KwCarOrder kwCarOrder = kwOrderMapper.selectById(orderId);
+        if (kwCarOrder.getRemainAllocation() < remainGoodsNum) {
+            throw  new RuntimeException("剩余待分配量不足");
+        }
+        double v = kwCarOrder.getRemainAllocation() - remainGoodsNum;
+        kwCarOrder.setRemainAllocation(v);
+        kwCarOrder.setStatus(OrderCarStatusEnum.IN_TRANSIT.getCode());
+        kwOrderMapper.updateById(kwCarOrder);
+
+        KwCarWaybillOrder kwCarWaybillOrder = new KwCarWaybillOrder();
+        kwCarWaybillOrder.setId(String.valueOf(waybillId));
+        kwCarWaybillOrder.setEntrustAmount(BigDecimal.valueOf(remainGoodsNum));
+        kwCarWaybillOrderMapper.updateById(kwCarWaybillOrder);
+        return remainGoodsNum;
+    }
+
+    public void saveCreateDispatchAddress(List<KwOrderCarWaybillOrderDispatchAddressReq> pathList, String waybillId, String orderId)
+    {
+        ArrayList<KwOrderCarWaybillOrderDispatchAddress> addressLists = new ArrayList<>();
+        pathList.forEach(f -> {
+            KwOrderCarWaybillOrderDispatchAddress kwOrderCarWaybillOrderDispatchAddress = BeanUtils.copyProperties(f, KwOrderCarWaybillOrderDispatchAddress.class);
+            Long id = new IdWorker(Global.NUMERICAL_ONE).nextId();
+            kwOrderCarWaybillOrderDispatchAddress.setId(id);
+            kwOrderCarWaybillOrderDispatchAddress.setOrderId(orderId);
+            kwOrderCarWaybillOrderDispatchAddress.setWaybillId(waybillId);
+            kwOrderCarWaybillOrderDispatchAddress.setName(f.getName());
+            kwOrderCarWaybillOrderDispatchAddress.setAddressId(f.getAddressId());
+            kwOrderCarWaybillOrderDispatchAddress.setAddressType(f.getAddressType());
+            kwOrderCarWaybillOrderDispatchAddress.setUnit(f.getUnit());
+            kwOrderCarWaybillOrderDispatchAddress.setEntrustAmount(f.getEntrustAmount());
+            kwOrderCarWaybillOrderDispatchAddress.setSort(f.getSort());
+            addressLists.add(kwOrderCarWaybillOrderDispatchAddress);
+        });
+        kwOrderCarWaybillOrderDispatchAddressMapper.insertBatch(addressLists);
+
+    }
+
+    @Transactional
+    public HttpResult completeOrder(KwOrderCarCompleteParam kwOrderCarCompleteParam) {
+        Long orderId = kwOrderCarCompleteParam.getOrderId();
+        List<KwOrderCompletePathDto> pathList = kwOrderCarCompleteParam.getPath();
+
+        BigDecimal totalMultiply = BigDecimal.ZERO;
+
+        List<KwOrderCarLandTransportPath> pathsToUpdate = new ArrayList<>();
+        for (KwOrderCompletePathDto e : pathList) {
+            KwOrderCarLandTransportPath pathObj = kwOrderCarLandTransportPathMapper.selectById(e.getId());
+            if (pathObj != null) {
+                /* 结算量*里程价 */
+                BigDecimal multiply = e.getSettleAmount().multiply(pathObj.getTransportPrice());
+
+                totalMultiply = totalMultiply.add(multiply);
+
+                KwOrderCarLandTransportPath pathToUpdate = new KwOrderCarLandTransportPath();
+                pathToUpdate.setId(pathObj.getId());
+                pathToUpdate.setSettlementAmount(multiply);
+                pathsToUpdate.add(pathToUpdate);
+            }
+        }
+
+        // 执行批量更新
+        if (!pathsToUpdate.isEmpty()) {
+            kwOrderCarLandTransportPathMapper.batchUpdateSettlementAmount(pathsToUpdate);
+        }
+
+        // 更新订单状态
+        KwCarOrder kwCarOrder = new KwCarOrder();
+        kwCarOrder.setId(String.valueOf(orderId));
+        kwCarOrder.setStatus(OrderCarStatusEnum.FINISHED.getCode());
+        kwOrderMapper.updateById(kwCarOrder);
+
+        // TODO 添加操作记录
+
+        return HttpResult.ok("完结成功");
+    }
+
+    /**
+    * @Description: 运单详情
+    * @Author: Lt
+    * @Date: 2024/4/22 10:31
+    */
+    public KwOrderWaybillDetailRes waybillDetail(String orderId)
+    {
+        //查询运单详情
+        return kwCarWaybillOrderMapper.selectWaybillDetailById(orderId);
+    }
+}

business-modules/business-car-transport/src/main/java/com/sckw/car/service/OrderCarDictService.java

@@ -1,129 +1,129 @@
-package com.sckw.car.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.sckw.car.entity.KwCarOrderDict;
-import com.sckw.car.entity.KwOrderCarDictReq;
-import com.sckw.car.entity.KwOrderCarDictRes;
-import com.sckw.car.mapper.KwOrderCarDictMapper;
-import com.sckw.core.utils.*;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @desc:
- * @author: lt
- * @date: 2024/4/3 17:40
- */
-@Service
-public class OrderCarDictService {
-
-    @Autowired
-    KwOrderCarDictMapper kwOrderDictMapper;
-
-    /**
-     * @desc: 字典新增
-     * @author: lt
-     * @date: 2024/4/3 17:50
-     */
-    public String dictInsert(KwOrderCarDictReq kwOrderDictReq)
-    {
-        // 创建查询条件包装器
-        QueryWrapper<KwCarOrderDict> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("dict_group", kwOrderDictReq.getDictGroup())
-                .eq("dict_value", kwOrderDictReq.getDictValue())
-                .eq("del_flag", 0);
-
-        // 查询是否已存在相同的字典数据
-        KwCarOrderDict existingDict = kwOrderDictMapper.selectOne(queryWrapper);
-
-        // 如果存在相同的字典数据，则抛出异常
-        if (existingDict != null) {
-            throw new RuntimeException("当前组已存在");
-        }
-
-        // 如果不存在相同的字典数据，则进行插入操作
-        KwCarOrderDict kwOrderDict = new KwCarOrderDict();
-        // 将请求对象的属性复制到字典对象中
-        BeanUtils.copyProperties(kwOrderDictReq, kwOrderDict);
-
-        // 进行插入操作
-        int rows = kwOrderDictMapper.insert(kwOrderDict);
-        if (rows > 0) {
-            return "插入成功";
-        } else {
-            throw new RuntimeException("插入失败");
-        }
-
-    }
-
-
-    public List<KwOrderCarDictRes> getDictData(String group) {
-        QueryWrapper<KwCarOrderDict> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("dict_group", group)
-                .eq("del_flag", 0);
-
-        List<KwCarOrderDict> dictList = kwOrderDictMapper.selectList(queryWrapper);
-
-        // 将查询到的 KwOrderDict 转换为 KwOrderDictRes
-
-        return dictFormat(dictList);
-    }
-
-    private List<KwOrderCarDictRes> dictFormat(List<KwCarOrderDict> list)
-    {
-        List<KwOrderCarDictRes> resList = new ArrayList<>();
-        for (KwCarOrderDict dict : list) {
-            KwOrderCarDictRes res = new KwOrderCarDictRes();
-            res.setLabel(dict.getDictLabel());
-            res.setValue(dict.getDictValue());
-            res.setGroup(dict.getDictGroup());
-            resList.add(res);
-        }
-        return resList;
-    }
-
-    public Map<String, Map<String, String>> queryDictByType(List<String> list) {
-        if (list.isEmpty()) {
-            return Collections.emptyMap();
-        }
-
-        Map<String, Map<String, String>> map = new HashMap<>(16);
-        for (String type : list) {
-            List<KwOrderCarDictRes> sysDictResDtos = queryDictByType(type);
-            if (sysDictResDtos.isEmpty()) {
-                continue;
-            }
-
-            Map<String, String> collect = sysDictResDtos.stream().collect(Collectors.toMap(KwOrderCarDictRes::getValue, KwOrderCarDictRes::getLabel, (n, o) -> n));
-            map.put(type, collect);
-        }
-        return map;
-    }
-
-    public List<KwOrderCarDictRes> queryDictByType(String type) {
-        System.out.println(type);
-        if (StringUtils.isBlank(type)) {
-            return Collections.emptyList();
-        }
-        //String key = Global.REDIS_SYS_DICT_TYPE_PREFIX + type;
-        //String dictCache = RedissonUtils.getString(key);
-        //从redis查，查不到从数据库查，并写入redis
-        //if (StringUtils.isBlank(dictCache)) {
-        List<KwCarOrderDict> sysDictList = kwOrderDictMapper.queryByType(type);
-        if (CollectionUtils.isEmpty(sysDictList)) {
-            return Collections.emptyList();
-        }
-            //List<KwOrderDictRes> sysDictResDtos = BeanUtils.copyProperties(sysDictList, KwOrderDictRes.class);
-            //RedissonUtils.putString(key, JSON.toJSONString(sysDictResDtos), Global.COMMON_EXPIRE);
-            //return sysDictResDtos;
-        //}
-        return dictFormat(sysDictList);
-        //RedissonUtils.putString(key, dictCache, Global.COMMON_EXPIRE);
-    }
-
-
-}
+package com.sckw.car.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.sckw.car.entity.KwCarOrderDict;
+import com.sckw.car.entity.KwOrderCarDictReq;
+import com.sckw.car.entity.KwOrderCarDictRes;
+import com.sckw.car.mapper.KwOrderCarDictMapper;
+import com.sckw.core.utils.*;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @desc:
+ * @author: lt
+ * @date: 2024/4/3 17:40
+ */
+@Service
+public class OrderCarDictService {
+
+    @Autowired
+    KwOrderCarDictMapper kwOrderDictMapper;
+
+    /**
+     * @desc: 字典新增
+     * @author: lt
+     * @date: 2024/4/3 17:50
+     */
+    public String dictInsert(KwOrderCarDictReq kwOrderDictReq)
+    {
+        // 创建查询条件包装器
+        QueryWrapper<KwCarOrderDict> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("dict_group", kwOrderDictReq.getDictGroup())
+                .eq("dict_value", kwOrderDictReq.getDictValue())
+                .eq("del_flag", 0);
+
+        // 查询是否已存在相同的字典数据
+        KwCarOrderDict existingDict = kwOrderDictMapper.selectOne(queryWrapper);
+
+        // 如果存在相同的字典数据，则抛出异常
+        if (existingDict != null) {
+            throw new RuntimeException("当前组已存在");
+        }
+
+        // 如果不存在相同的字典数据，则进行插入操作
+        KwCarOrderDict kwOrderDict = new KwCarOrderDict();
+        // 将请求对象的属性复制到字典对象中
+        BeanUtils.copyProperties(kwOrderDictReq, kwOrderDict);
+
+        // 进行插入操作
+        int rows = kwOrderDictMapper.insert(kwOrderDict);
+        if (rows > 0) {
+            return "插入成功";
+        } else {
+            throw new RuntimeException("插入失败");
+        }
+
+    }
+
+
+    public List<KwOrderCarDictRes> getDictData(String group) {
+        QueryWrapper<KwCarOrderDict> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("dict_group", group)
+                .eq("del_flag", 0);
+
+        List<KwCarOrderDict> dictList = kwOrderDictMapper.selectList(queryWrapper);
+
+        // 将查询到的 KwOrderDict 转换为 KwOrderDictRes
+
+        return dictFormat(dictList);
+    }
+
+    private List<KwOrderCarDictRes> dictFormat(List<KwCarOrderDict> list)
+    {
+        List<KwOrderCarDictRes> resList = new ArrayList<>();
+        for (KwCarOrderDict dict : list) {
+            KwOrderCarDictRes res = new KwOrderCarDictRes();
+            res.setLabel(dict.getDictLabel());
+            res.setValue(dict.getDictValue());
+            res.setGroup(dict.getDictGroup());
+            resList.add(res);
+        }
+        return resList;
+    }
+
+    public Map<String, Map<String, String>> queryDictByType(List<String> list) {
+        if (list.isEmpty()) {
+            return Collections.emptyMap();
+        }
+
+        Map<String, Map<String, String>> map = new HashMap<>(16);
+        for (String type : list) {
+            List<KwOrderCarDictRes> sysDictResDtos = queryDictByType(type);
+            if (sysDictResDtos.isEmpty()) {
+                continue;
+            }
+
+            Map<String, String> collect = sysDictResDtos.stream().collect(Collectors.toMap(KwOrderCarDictRes::getValue, KwOrderCarDictRes::getLabel, (n, o) -> n));
+            map.put(type, collect);
+        }
+        return map;
+    }
+
+    public List<KwOrderCarDictRes> queryDictByType(String type) {
+        System.out.println(type);
+        if (StringUtils.isBlank(type)) {
+            return Collections.emptyList();
+        }
+        //String key = Global.REDIS_SYS_DICT_TYPE_PREFIX + type;
+        //String dictCache = RedissonUtils.getString(key);
+        //从redis查，查不到从数据库查，并写入redis
+        //if (StringUtils.isBlank(dictCache)) {
+        List<KwCarOrderDict> sysDictList = kwOrderDictMapper.queryByType(type);
+        if (CollectionUtils.isEmpty(sysDictList)) {
+            return Collections.emptyList();
+        }
+            //List<KwOrderDictRes> sysDictResDtos = BeanUtils.copyProperties(sysDictList, KwOrderDictRes.class);
+            //RedissonUtils.putString(key, JSON.toJSONString(sysDictResDtos), Global.COMMON_EXPIRE);
+            //return sysDictResDtos;
+        //}
+        return dictFormat(sysDictList);
+        //RedissonUtils.putString(key, dictCache, Global.COMMON_EXPIRE);
+    }
+
+
+}

business-modules/business-car-transport/src/main/resources/mapper/KwCarOrderMapper.xml

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sckw.car.mapper.KwCarOrderMapper">
-    <select id="countByStatus" resultType="java.util.Map">
-        SELECT `status`, COUNT(*) AS count FROM kw_order where del_flag = 0  and tenant_id = #{tenant} GROUP BY `status`
-    </select>
-    <select id="finishWaybillCount" resultType="java.lang.Integer">
-        select count(id) from kw_waybill_order where order_id = #{orderId} and status = 5 and del_flag = 0
-    </select>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.car.mapper.KwCarOrderMapper">
+    <select id="countByStatus" resultType="java.util.Map">
+        SELECT `status`, COUNT(*) AS count FROM kw_order where del_flag = 0  and tenant_id = #{tenant} GROUP BY `status`
+    </select>
+    <select id="finishWaybillCount" resultType="java.lang.Integer">
+        select count(id) from kw_waybill_order where order_id = #{orderId} and status = 5 and del_flag = 0
+    </select>
 </mapper>

business-modules/business-car-transport/src/main/resources/mapper/KwCarWaybillOrderMapper.xml

@@ -1,82 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sckw.car.mapper.KwCarWaybillOrderMapper">
-
-    <resultMap type="com.sckw.car.entity.res.KwOrderWaybillDetailRes" id="selectWaybillDetail">
-        <id property="id" column="id" />
-        <result property="tyCompany" column="tyCompany" />
-        <result property="cyCompany" column="cyCompany" />
-        <!-- 一对多级联查询，ofType表示集合中的元素类型，将id传递给selectOrderById -->
-        <collection property="pathList" column="id" select="selectPathList" />
-    </resultMap>
-    <insert id="insertBatch">
-        insert into kw_waybill_order
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            id,
-            ent_id,
-            order_id,
-            t_order_no,
-            type,
-            truck_id,
-            truck_no,
-            driver_id,
-            driver_name,
-            driver_phone,
-            driver_idcard,
-            remark,
-            `status`,
-            entrust_amount,
-            unload_amount,
-            load_amount,
-            deficit_amount,
-            start_time,
-            end_time,
-            t_type,
-            tenant_id,
-            create_by
-        </trim>
-        values
-        <foreach collection="list" item="item" separator=",">
-            <trim prefix="(" suffix=")" suffixOverrides=",">
-                ${item.id},
-                #{item.entId,jdbcType=BIGINT},
-                #{item.orderId,jdbcType=BIGINT},
-                #{item.tOrderNo,jdbcType=BIGINT},
-                #{item.type,jdbcType=BIGINT},
-                #{item.truckId,jdbcType=BIGINT},
-                #{item.truckNo,jdbcType=VARCHAR},
-                #{item.driverId,jdbcType=BIGINT},
-                #{item.driverName,jdbcType=VARCHAR},
-                #{item.driverPhone,jdbcType=VARCHAR},
-                #{item.driverIdcard,jdbcType=VARCHAR},
-                #{item.remark,jdbcType=VARCHAR},
-                #{item.status,jdbcType=INTEGER},
-                #{item.entrustAmount,jdbcType=DECIMAL},
-                #{item.unloadAmount,jdbcType=DECIMAL},
-                #{item.loadAmount,jdbcType=DECIMAL},
-                #{item.deficitAmount,jdbcType=DECIMAL},
-                #{item.startTime,jdbcType=VARCHAR},
-                #{item.endTime,jdbcType=VARCHAR},
-                #{item.tType,jdbcType=INTEGER},
-                #{item.tenantId,jdbcType=VARCHAR},
-                #{item.createBy,jdbcType=VARCHAR}
-            </trim>
-        </foreach>
-
-    </insert>
-
-    <select id="selectWaybillDetailById" resultMap="selectWaybillDetail" resultType="com.sckw.car.entity.res.KwOrderWaybillDetailRes">
-        select
-            id,
-            ty_company,
-            cy_company
-        from kw_order as o
-        where
-            o.id = #{id} and o.del_flag = 0
-    </select>
-
-    <select id="selectPathList" resultType="com.sckw.car.entity.res.KwOrderDetailPath">
-        select id,name, order_id,list_id from kw_order_car_land_transport_path where del_flag = 0 and order_id = #{id}
-    </select>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.car.mapper.KwCarWaybillOrderMapper">
+
+    <resultMap type="com.sckw.car.entity.res.KwOrderWaybillDetailRes" id="selectWaybillDetail">
+        <id property="id" column="id" />
+        <result property="tyCompany" column="tyCompany" />
+        <result property="cyCompany" column="cyCompany" />
+        <!-- 一对多级联查询，ofType表示集合中的元素类型，将id传递给selectOrderById -->
+        <collection property="pathList" column="id" select="selectPathList" />
+    </resultMap>
+    <insert id="insertBatch">
+        insert into kw_waybill_order
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            id,
+            ent_id,
+            order_id,
+            t_order_no,
+            type,
+            truck_id,
+            truck_no,
+            driver_id,
+            driver_name,
+            driver_phone,
+            driver_idcard,
+            remark,
+            `status`,
+            entrust_amount,
+            unload_amount,
+            load_amount,
+            deficit_amount,
+            start_time,
+            end_time,
+            t_type,
+            tenant_id,
+            create_by
+        </trim>
+        values
+        <foreach collection="list" item="item" separator=",">
+            <trim prefix="(" suffix=")" suffixOverrides=",">
+                ${item.id},
+                #{item.entId,jdbcType=BIGINT},
+                #{item.orderId,jdbcType=BIGINT},
+                #{item.tOrderNo,jdbcType=BIGINT},
+                #{item.type,jdbcType=BIGINT},
+                #{item.truckId,jdbcType=BIGINT},
+                #{item.truckNo,jdbcType=VARCHAR},
+                #{item.driverId,jdbcType=BIGINT},
+                #{item.driverName,jdbcType=VARCHAR},
+                #{item.driverPhone,jdbcType=VARCHAR},
+                #{item.driverIdcard,jdbcType=VARCHAR},
+                #{item.remark,jdbcType=VARCHAR},
+                #{item.status,jdbcType=INTEGER},
+                #{item.entrustAmount,jdbcType=DECIMAL},
+                #{item.unloadAmount,jdbcType=DECIMAL},
+                #{item.loadAmount,jdbcType=DECIMAL},
+                #{item.deficitAmount,jdbcType=DECIMAL},
+                #{item.startTime,jdbcType=VARCHAR},
+                #{item.endTime,jdbcType=VARCHAR},
+                #{item.tType,jdbcType=INTEGER},
+                #{item.tenantId,jdbcType=VARCHAR},
+                #{item.createBy,jdbcType=VARCHAR}
+            </trim>
+        </foreach>
+
+    </insert>
+
+    <select id="selectWaybillDetailById" resultMap="selectWaybillDetail" resultType="com.sckw.car.entity.res.KwOrderWaybillDetailRes">
+        select
+            id,
+            ty_company,
+            cy_company
+        from kw_order as o
+        where
+            o.id = #{id} and o.del_flag = 0
+    </select>
+
+    <select id="selectPathList" resultType="com.sckw.car.entity.res.KwOrderDetailPath">
+        select id,name, order_id,list_id from kw_order_car_land_transport_path where del_flag = 0 and order_id = #{id}
+    </select>
+
 </mapper>

business-modules/business-car-transport/src/main/resources/mapper/KwOrderCarDictMapper.xml

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sckw.car.mapper.KwOrderCarDictMapper">
-    <select id="queryByType" resultType="com.sckw.car.entity.KwCarOrderDict">
-        select * from kw_order_dict where del_flag = 0 and dict_group = #{group}
-    </select>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.car.mapper.KwOrderCarDictMapper">
+    <select id="queryByType" resultType="com.sckw.car.entity.KwCarOrderDict">
+        select * from kw_order_dict where del_flag = 0 and dict_group = #{group}
+    </select>
 </mapper>

business-modules/business-car-transport/src/main/resources/mapper/KwOrderCarLandTransportInventoryMapper.xml

@@ -1,92 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sckw.car.mapper.KwOrderCarLandTransportInventoryMapper">
-
-    <resultMap type="com.sckw.car.entity.res.ListDetailRes" id="listDetail">
-        <id property="id" column="id" />
-        <result property="name" column="name" />
-        <!-- 一对多级联查询，ofType表示集合中的元素类型，将id传递给selectOrderById -->
-        <collection property="list" column="id" select="selectListDetail" />
-    </resultMap>
-
-    <select id="selectList" resultMap="listDetail" resultType="com.sckw.car.entity.res.ListDetailRes">
-        select id,`name` from kw_order_car_land_transport_list
-        <where>
-            del_flag = 0
-            <if test="name != null and name != ''">
-                and `name` like concat('%', #{name}, '%')
-            </if>
-        </where>
-    </select>
-
-    <select id="selectListDetail" resultType="com.sckw.car.entity.res.ListAndDetailDto">
-        select id,`name`,list_order_num from kw_order_car_land_transport_list_detail where del_flag = 0 and car_list_id = #{id}
-    </select>
-    <select id="selectByOrderId" resultType="com.sckw.car.entity.res.CarDetailRes">
-        select
-        <!--            header-->
-        o.id,
-        o.order_source orderSource,
-        o.order_no orderNo,
-        o.create_time createTime,
-        o.create_by createBy,
-        o.status,
-        o.pid,
-        o.type_handling typeHandling,
-        <!--            企业信息-->
-        o.ty_company_id tyCompanId,
-        o.ty_company tyCompany,
-        o.ty_phone tyPhone,
-        o.cy_company_id cyCompanyId,
-        o.cy_company cyCompany,
-        o.cy_phone cyPhone,
-        o.fh_company_id fhCompanyId,
-        o.fh_company fhCompany,
-        o.fh_phone fhPhone,
-        o.sh_company_id shCompanyId,
-        o.sh_company shCompany,
-        o.sh_phone shPhone,
-        o.remain_allocation remainAllocation,
-        o.remain_num remainNum,
-        o.tenant_id tenantId,
-        <!--            货物信息-->
-#         tg.goods_id goodsId,
-#         tg.goods_name goodsName,
-#         tg.goods_type goodsType,
-#         tg.goods_unit goodsUnit,
-#         tg.goods_num  goodsNum,
-#         tg.goods_volume goodsVolume,
-#         tg.goods_weight goodsWeight,
-        <!--            履约信息-->
-        tp.per_start_time perStartTime,
-        tp.per_end_time perEndTime,
-        tp.billing_cycle settlementCycle,
-        tp.pay_method payment,
-        tp.pay_company payCompany,
-        tp.billing_mode billingMode,
-        tp.gathering_company gatheringCompany,
-        tp.price,
-        <!--            履约记录-->
-        o.total_load_amount,
-        o.total_unload_amount,
-        o.remain_num,
-        <!--            扣亏货-->
-        tdg.rational_loss rationalLoss,
-        tdg.ded_price dedPrice,
-        <!--            更多信息-->
-        tm.truck_type truckType,
-        tm.truck_type_str truckTypeStr,
-        tm.estimate_freight estimateFreight
-        from kw_order o
-        left join kw_order_car_land_transport_per tp on o.id = tp.order_id
-        left join kw_order_car_land_transport_more tm on o.id = tm.order_id
-        left join kw_order_car_land_transport_def_goods tdg on o.id = tdg.order_id
-        <where>
-            o.del_flag = 0
-            <if test="orderId != null">
-                and o.id = #{orderId}
-            </if>
-        </where>
-    </select>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.car.mapper.KwOrderCarLandTransportInventoryMapper">
+
+    <resultMap type="com.sckw.car.entity.res.ListDetailRes" id="listDetail">
+        <id property="id" column="id" />
+        <result property="name" column="name" />
+        <!-- 一对多级联查询，ofType表示集合中的元素类型，将id传递给selectOrderById -->
+        <collection property="list" column="id" select="selectListDetail" />
+    </resultMap>
+
+    <select id="selectList" resultMap="listDetail" resultType="com.sckw.car.entity.res.ListDetailRes">
+        select id,`name` from kw_order_car_land_transport_list
+        <where>
+            del_flag = 0
+            <if test="name != null and name != ''">
+                and `name` like concat('%', #{name}, '%')
+            </if>
+        </where>
+    </select>
+
+    <select id="selectListDetail" resultType="com.sckw.car.entity.res.ListAndDetailDto">
+        select id,`name`,list_order_num from kw_order_car_land_transport_list_detail where del_flag = 0 and car_list_id = #{id}
+    </select>
+    <select id="selectByOrderId" resultType="com.sckw.car.entity.res.CarDetailRes">
+        select
+        <!--            header-->
+        o.id,
+        o.order_source orderSource,
+        o.order_no orderNo,
+        o.create_time createTime,
+        o.create_by createBy,
+        o.status,
+        o.pid,
+        o.type_handling typeHandling,
+        <!--            企业信息-->
+        o.ty_company_id tyCompanId,
+        o.ty_company tyCompany,
+        o.ty_phone tyPhone,
+        o.cy_company_id cyCompanyId,
+        o.cy_company cyCompany,
+        o.cy_phone cyPhone,
+        o.fh_company_id fhCompanyId,
+        o.fh_company fhCompany,
+        o.fh_phone fhPhone,
+        o.sh_company_id shCompanyId,
+        o.sh_company shCompany,
+        o.sh_phone shPhone,
+        o.remain_allocation remainAllocation,
+        o.remain_num remainNum,
+        o.tenant_id tenantId,
+        <!--            货物信息-->
+#         tg.goods_id goodsId,
+#         tg.goods_name goodsName,
+#         tg.goods_type goodsType,
+#         tg.goods_unit goodsUnit,
+#         tg.goods_num  goodsNum,
+#         tg.goods_volume goodsVolume,
+#         tg.goods_weight goodsWeight,
+        <!--            履约信息-->
+        tp.per_start_time perStartTime,
+        tp.per_end_time perEndTime,
+        tp.billing_cycle settlementCycle,
+        tp.pay_method payment,
+        tp.pay_company payCompany,
+        tp.billing_mode billingMode,
+        tp.gathering_company gatheringCompany,
+        tp.price,
+        <!--            履约记录-->
+        o.total_load_amount,
+        o.total_unload_amount,
+        o.remain_num,
+        <!--            扣亏货-->
+        tdg.rational_loss rationalLoss,
+        tdg.ded_price dedPrice,
+        <!--            更多信息-->
+        tm.truck_type truckType,
+        tm.truck_type_str truckTypeStr,
+        tm.estimate_freight estimateFreight
+        from kw_order o
+        left join kw_order_car_land_transport_per tp on o.id = tp.order_id
+        left join kw_order_car_land_transport_more tm on o.id = tm.order_id
+        left join kw_order_car_land_transport_def_goods tdg on o.id = tdg.order_id
+        <where>
+            o.del_flag = 0
+            <if test="orderId != null">
+                and o.id = #{orderId}
+            </if>
+        </where>
+    </select>
+
 </mapper>

business-modules/business-car-transport/src/main/resources/mapper/KwOrderCarLandTransportPathGoodsMapper.xml

@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sckw.car.mapper.KwOrderCarLandTransportPathGoodsMapper">
-
-    <insert id="insertBatch">
-        insert into kw_order_car_land_transport_path_goods
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            id,
-            car_path_id,
-            goods_id,
-            goods_name,
-            goods_num,
-            create_by
-        </trim>
-        values
-        <foreach collection="list" item="item" separator=",">
-            <trim prefix="(" suffix=")" suffixOverrides=",">
-                ${item.id},
-                #{item.carPathId,jdbcType=BIGINT},
-                #{item.goodsId,jdbcType=BIGINT},
-                #{item.goodsName,jdbcType=VARCHAR},
-                #{item.goodsNum,jdbcType=BIGINT},
-                #{item.createBy,jdbcType=VARCHAR}
-            </trim>
-        </foreach>
-    </insert>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.car.mapper.KwOrderCarLandTransportPathGoodsMapper">
+
+    <insert id="insertBatch">
+        insert into kw_order_car_land_transport_path_goods
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            id,
+            car_path_id,
+            goods_id,
+            goods_name,
+            goods_num,
+            create_by
+        </trim>
+        values
+        <foreach collection="list" item="item" separator=",">
+            <trim prefix="(" suffix=")" suffixOverrides=",">
+                ${item.id},
+                #{item.carPathId,jdbcType=BIGINT},
+                #{item.goodsId,jdbcType=BIGINT},
+                #{item.goodsName,jdbcType=VARCHAR},
+                #{item.goodsNum,jdbcType=BIGINT},
+                #{item.createBy,jdbcType=VARCHAR}
+            </trim>
+        </foreach>
+    </insert>
 </mapper>