Merge branch 'dev_20251130' into dev_20260131

# Conflicts:
#	sckw-gateway/src/main/java/com/sckw/gateway/filter/AuthenticationFilter.java

sckw-gateway/src/main/java/com/sckw/gateway/filter/AuthenticationFilter.java

@@ -94,19 +94,21 @@ public class AuthenticationFilter implements GlobalFilter, Ordered {
         String requestUri = request.getPath().value();
         /*1、非token校验接口放行*/
         if (EXCLUDEPATH.contains(requestUri)) {
-            Map<String, Object> tokenMap = EncryUtil.descryV2(Global.PRI_KEY, token);
-            if (tokenMap != null) {
-                Long userId = StringUtils.isNotBlank(tokenMap.get("userId")) ? NumberUtils.parseLong(tokenMap.get("userId")) : null;
-                String key = Global.getFullUserLoginKey(systemType, userId);
-
-                String userInfoStr = RedissonUtils.getString(key);
-                LoginUserInfo loginUserInfo = StringUtils.isNotBlank(userInfoStr) ? com.alibaba.fastjson.JSON.parseObject(userInfoStr, LoginUserInfo.class) : null;
-                if (Objects.nonNull(loginUserInfo)) {
-                    loginUserInfo.setClientType(clientType);
-                    String loginEntStr = RedissonUtils.getString(Global.getFullUserEntKey(loginUserInfo.getEntId()));
-                    LoginEntInfo loginEntInfo = StringUtils.isNotBlank(loginEntStr) ? com.alibaba.fastjson.JSON.parseObject(loginEntStr, LoginEntInfo.class) : null;
-                    ServerWebExchange build = buildNewExchange(exchange,loginUserInfo,loginEntInfo);
-                    return chain.filter(build);
+            if (StrUtil.isNotBlank(token)) {
+                Map<String, Object> tokenMap = EncryUtil.descryV2(Global.PRI_KEY, token);
+                if (tokenMap != null) {
+                    Long userId = StringUtils.isNotBlank(tokenMap.get("userId")) ? NumberUtils.parseLong(tokenMap.get("userId")) : null;
+                    String key = Global.getFullUserLoginKey(systemType, userId);
+
+                    String userInfoStr = RedissonUtils.getString(key);
+                    LoginUserInfo loginUserInfo = StringUtils.isNotBlank(userInfoStr) ? com.alibaba.fastjson.JSON.parseObject(userInfoStr, LoginUserInfo.class) : null;
+                    if (Objects.nonNull(loginUserInfo)) {
+                        loginUserInfo.setClientType(clientType);
+                        String loginEntStr = RedissonUtils.getString(Global.getFullUserEntKey(loginUserInfo.getEntId()));
+                        LoginEntInfo loginEntInfo = StringUtils.isNotBlank(loginEntStr) ? com.alibaba.fastjson.JSON.parseObject(loginEntStr, LoginEntInfo.class) : null;
+                        ServerWebExchange build = buildNewExchange(exchange,loginUserInfo,loginEntInfo);
+                        return chain.filter(build);
+                    }
                 }
             }
             return chain.filter(exchange);

sckw-modules-api/pom.xml

@@ -7,12 +7,7 @@
         <groupId>com.sckw</groupId>
         <version>1.0.0</version>
     </parent>
-    <dependencies>
-        <dependency>
-            <groupId>com.sckw</groupId>
-            <artifactId>sckw-common-core</artifactId>
-        </dependency>
-    </dependencies>
+
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sckw-modules-api</artifactId>
@@ -29,6 +24,7 @@
         <module>sckw-contract-api</module>
         <module>sckw-payment-api</module>
         <module>sckw-manage-api</module>
+        <module>sckw-report-api</module>
     </modules>
 
     <properties>
@@ -36,4 +32,4 @@
         <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
-</project>
+</project>

sckw-modules-api/sckw-modules-bom/pom.xml

@@ -67,6 +67,11 @@
                 <artifactId>sckw-product-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.sckw</groupId>
+                <artifactId>sckw-report-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/feign/TradeOrderApi.java

@@ -1,9 +1,25 @@
 package com.sckw.order.api.feign;
 
+import com.sckw.order.api.model.OrderPara;
+import com.sckw.order.api.model.TradeOrderVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.List;
+
 /**
  * @author xucaiqin
  * @date 2025-12-01 15:26:28
  */
+@FeignClient(name = "sckw-ng-order", contextId = "TradeOrderApi")
 public interface TradeOrderApi {
-
+    /**
+     * 分页查询物流订单
+     *
+     * @param para
+     * @return
+     */
+    @GetMapping("/tradeOrder/trade")
+    List<TradeOrderVo> trade(@SpringQueryMap OrderPara para);
 }

sckw-modules/sckw-order/src/main/java/com/sckw/order/enums/OrderPara.java → sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/OrderPara.java

@@ -1,4 +1,4 @@
-package com.sckw.order.enums;
+package com.sckw.order.api.model;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;

sckw-modules-api/sckw-report-api/pom.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.sckw</groupId>
+        <artifactId>sckw-modules-api</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>sckw-report-api</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sckw</groupId>
+            <artifactId>sckw-common-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations-jakarta</artifactId>
+            <version>2.2.22</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>

sckw-modules-api/sckw-report-api/src/main/java/com/sckw/report/api/feign/ReportApi.java

@@ -0,0 +1,19 @@
+package com.sckw.report.api.feign;
+
+import com.sckw.report.api.model.TodoCountVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@FeignClient(name = "sckw-ng-report", contextId = "ReportApi")
+public interface ReportApi {
+
+
+    /**
+     * ai助手待办统计
+     *
+     * @return
+     */
+    @GetMapping("/kwHome/count")
+    TodoCountVo count();
+
+}

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/TodoCountVo.java → sckw-modules-api/sckw-report-api/src/main/java/com/sckw/report/api/model/TodoCountVo.java

@@ -1,4 +1,4 @@
-package com.sckw.report.service.vo;
+package com.sckw.report.api.model;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/ViewUrl.java → sckw-modules-api/sckw-report-api/src/main/java/com/sckw/report/api/model/ViewUrl.java

@@ -1,4 +1,4 @@
-package com.sckw.report.service.vo;
+package com.sckw.report.api.model;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/feign/TransportApi.java

@@ -0,0 +1,35 @@
+package com.sckw.transport.api.feign;
+
+import com.sckw.transport.api.model.LogisticsBaseOrderVo;
+import com.sckw.transport.api.model.dto.McpLogisticsOrderVo;
+import com.sckw.transport.api.model.param.OrderPara;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.List;
+
+/**
+ * 车辆轨迹服务 Feign 客户端
+ * 调用数据中台的车辆轨迹接口
+ *
+ * @author system
+ * @date 2024
+ */
+
+@FeignClient(name = "sckw-ng-transport", contextId = "TransportApi")
+public interface TransportApi {
+
+
+    /**
+     * 分页查询物流订单
+     *
+     * @param para
+     * @return
+     */
+    @GetMapping("/logisticsOrder/list")
+    List<McpLogisticsOrderVo> list(@SpringQueryMap OrderPara para);
+
+    @GetMapping("/logisticsOrder/base")
+    List<LogisticsBaseOrderVo> base(@SpringQueryMap OrderPara para);
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/LogisticsBaseOrderVo.java → sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/LogisticsBaseOrderVo.java

@@ -1,4 +1,4 @@
-package com.sckw.transport.model.vo;
+package com.sckw.transport.api.model;
 
 import lombok.Data;
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/LogisticsOrderVo.java → sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/dto/McpLogisticsOrderVo.java

@@ -1,8 +1,7 @@
-package com.sckw.transport.model.vo;
+package com.sckw.transport.api.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.sckw.order.api.model.OrderUrl;
 import lombok.Data;
 
 import java.io.Serial;
@@ -12,48 +11,106 @@ import java.time.LocalDateTime;
 
 
 @Data
-public class LogisticsOrderVo implements Serializable {
+public class McpLogisticsOrderVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 4964311980474791569L;
     private Long id;
     private String moreUrl;
-
+    /**
+     * 贸易订单id
+     */
     @JsonProperty("tOrderId")
     private Long tOrderId;
-
+    /**
+     * 物流订单id
+     */
     @JsonProperty("lOrderId")
     private Long lOrderId;
-
+    /**
+     * 物流订单号
+     */
     @JsonProperty("lOrderNo")
     private String lOrderNo;
-
+    /**
+     * 物流订单跳转地址信息，用户可以直接点击订单号进行跳转
+     */
     @JsonProperty("lOrderNoUrl")
     private OrderUrl lOrderNoUrl;
-
+    /**
+     * 贸易订单号
+     */
     @JsonProperty("tOrderNo")
     private String tOrderNo;
-
+    /**
+     * 贸易订单跳转地址信息，用户可以直接点击订单号进行跳转
+     */
     @JsonProperty("tOrderNoUrl")
     private OrderUrl tOrderNoUrl;
-
+    /**
+     * 委托量
+     */
     private BigDecimal amount;
+    /**
+     * 订单状态
+     */
     private Integer status;
+    /**
+     * 订单状态文本
+     */
     private String statusLabel;
+    /**
+     * 托运企业名称
+     */
     private String tyFirmName;
+    /**
+     * 承运企业名称
+     */
     private String cyFirmName;
+    /**
+     * 创建时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
-
+    /**
+     * 商品名称
+     */
     private String goodsName;
+    /**
+     * 商品id
+     */
     private Long goodsId;
+    /**
+     * 运输单价
+     */
     private BigDecimal price;//运输单价
+    /**
+     * 计费方式
+     */
     private String billingMode;//计费方式
+    /**
+     * 预计运费
+     */
     private BigDecimal money;//预计运费
+    /**
+     * 实际运费
+     */
     private BigDecimal pay;//实际运费
+    /**
+     * 累计装货量
+     */
     private BigDecimal loadAmount;//累计装货量
+    /**
+     * 累计卸货量
+     */
     private BigDecimal unloadAmount;//累计卸货量
+    /**
+     * 开始时间
+     */
     @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;
 

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/dto/OrderUrl.java

@@ -0,0 +1,25 @@
+package com.sckw.transport.api.model.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @author xucaiqin
+ * @date 2026-01-15 13:45:43
+ */
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderUrl implements Serializable {
+    @Schema(description = "订单号")
+    private String orderNo;
+    @Schema(description = "跳转链接")
+    private String url;
+
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/OrderPara.java → sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/param/OrderPara.java

@@ -1,4 +1,4 @@
-package com.sckw.transport.model;
+package com.sckw.transport.api.model.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;

sckw-modules/sckw-order/src/main/java/com/sckw/order/controller/KwoTradeOrderController.java

@@ -8,7 +8,7 @@ import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.order.api.model.TradeOrderPara;
-import com.sckw.order.enums.OrderPara;
+import com.sckw.order.api.model.OrderPara;
 import com.sckw.order.model.vo.req.*;
 import com.sckw.order.serivce.KwoTradeOrderService;
 import io.seata.spring.annotation.GlobalTransactional;

sckw-modules/sckw-order/src/main/java/com/sckw/order/controller/McpController.java

@@ -0,0 +1,47 @@
+package com.sckw.order.controller;
+
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.sckw.order.api.model.TradeOrderPara;
+import com.sckw.order.api.model.TradeOrderVo;
+import com.sckw.order.api.model.OrderPara;
+import com.sckw.order.serivce.KwoTradeOrderService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author lfdc
+ * @desc 物流订单Controller-v4.2
+ * @date 2024-03-11 11:06:06
+ */
+@Slf4j
+@Validated
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(value = "/tradeOrder")
+@Tag(name = "物流订单相关接口")
+public class McpController {
+
+    private final KwoTradeOrderService kwoTradeOrderService;
+
+
+    @GetMapping(value = "/trade")
+    @Operation(summary = "查询贸易订单", description = "查询贸易订单")
+    public List<TradeOrderVo> list(@ParameterObject OrderPara orderPara) {
+        TradeOrderPara tradeOrderPara = new TradeOrderPara();
+        tradeOrderPara.setStartTime(LocalDateTimeUtil.parse(orderPara.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
+        tradeOrderPara.setEndTime(LocalDateTimeUtil.parse(orderPara.getEndTime(), "yyyy-MM-dd HH:mm:ss"));
+        tradeOrderPara.setUserId(orderPara.getUserId());
+        tradeOrderPara.setOrderNo(orderPara.getOrderNo());
+        return  kwoTradeOrderService.queryOrder(tradeOrderPara);
+    }
+
+}

sckw-modules/sckw-report/pom.xml

@@ -85,7 +85,11 @@
 <!--            <version>1.0.0</version>-->
             <version>${basic.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.sckw</groupId>
+            <artifactId>sckw-report-api</artifactId>
+            <version>${basic.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.sckw</groupId>
             <artifactId>sckw-transport-api</artifactId>
@@ -177,4 +181,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

sckw-modules/sckw-report/src/main/java/com/sckw/report/controller/HomeController.java

@@ -10,7 +10,7 @@ import com.sckw.core.web.response.BaseResult;
 import com.sckw.order.api.model.*;
 import com.sckw.report.service.KwHomeService;
 import com.sckw.report.service.vo.OperationCountVo;
-import com.sckw.report.service.vo.TodoCountVo;
+import com.sckw.report.api.model.TodoCountVo;
 import com.sckw.transport.api.model.param.LogisticsOrderAuditPara;
 import com.sckw.transport.api.model.vo.LogisticsDto;
 import com.sckw.transport.api.model.vo.LogisticsVo;
@@ -38,10 +38,11 @@ public class HomeController {
     public BaseResult<OperationCountVo> operationCount() {
         return BaseResult.success(kwHomeService.operationCount());
     }
+
     @GetMapping("/count")
     @Operation(summary = "ai助手待办统计", description = "ai助手待办统计")
-    public BaseResult<TodoCountVo> todoCount() {
-        return BaseResult.success(kwHomeService.todoCount());
+    public TodoCountVo todoCount() {
+        return kwHomeService.todoCount();
     }
 
     @GetMapping("/operationTradeContract")

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwHomeService.java

@@ -1,6 +1,6 @@
 package com.sckw.report.service;
 
-import com.sckw.report.service.vo.ViewUrl;
+import com.sckw.report.api.model.ViewUrl;
 
 import cn.hutool.core.date.LocalDateTimeUtil;
 import com.sckw.contract.api.RemoteContractService;
@@ -13,7 +13,7 @@ import com.sckw.core.utils.BeanUtils;
 import com.sckw.order.api.dubbo.TradeOrderInfoService;
 import com.sckw.order.api.model.*;
 import com.sckw.report.service.vo.OperationCountVo;
-import com.sckw.report.service.vo.TodoCountVo;
+import com.sckw.report.api.model.TodoCountVo;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.transport.api.dubbo.TransportRemoteService;
 import com.sckw.transport.api.model.vo.LogisticsDto;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwtLogisticsOrderController.java

@@ -8,7 +8,7 @@ import com.sckw.core.web.response.BaseResult;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.core.web.response.result.PageDataResult;
 import com.sckw.transport.model.LogisticsOrderPara;
-import com.sckw.transport.model.OrderPara;
+import com.sckw.transport.api.model.param.OrderPara;
 import com.sckw.transport.model.dto.*;
 import com.sckw.transport.model.param.AddLogisticsOrderParam;
 import com.sckw.transport.model.param.LogisticsOrderResp;
@@ -209,15 +209,6 @@ public class KwtLogisticsOrderController {
         return BaseResult.success(transportCommonService.queryOrderUnits());
     }
 
-    @GetMapping(value = "/list")
-    @Operation(summary = "分页查询物流订单", description = "分页查询物流订单")
-    public HttpResult list(@ParameterObject OrderPara orderPara) {
-        LogisticsOrderPara tradeOrderPara = new LogisticsOrderPara();
-        tradeOrderPara.setStartTime(LocalDateTimeUtil.parse(orderPara.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
-        tradeOrderPara.setEndTime(LocalDateTimeUtil.parse(orderPara.getEndTime(), "yyyy-MM-dd HH:mm:ss"));
-        tradeOrderPara.setUserId(orderPara.getUserId());
-        return HttpResult.ok(logisticsConsignmentService.queryList(tradeOrderPara));
-    }
 
     @GetMapping(value = "/base")
     @Operation(summary = "分页查询物流订单概要信息", description = "分页查询物流订单概要信息")

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/McpController.java

@@ -0,0 +1,61 @@
+package com.sckw.transport.controller;
+
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.sckw.transport.api.model.LogisticsBaseOrderVo;
+import com.sckw.transport.api.model.dto.McpLogisticsOrderVo;
+import com.sckw.transport.api.model.param.OrderPara;
+import com.sckw.transport.model.LogisticsOrderPara;
+import com.sckw.transport.service.KwtLogisticsConsignmentService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author lfdc
+ * @desc 物流订单Controller-v4.2
+ * @date 2024-03-11 11:06:06
+ */
+@Slf4j
+@Validated
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(value = "/logisticsOrder")
+@Tag(name = "物流订单相关接口")
+public class McpController {
+
+    @Autowired
+    KwtLogisticsConsignmentService logisticsConsignmentService;
+
+
+    @PostMapping(value = "/list")
+    @Operation(summary = "分页查询物流订单", description = "分页查询物流订单")
+    public List<McpLogisticsOrderVo> list(@RequestBody OrderPara orderPara) {
+        LogisticsOrderPara tradeOrderPara = new LogisticsOrderPara();
+        tradeOrderPara.setStartTime(LocalDateTimeUtil.parse(orderPara.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
+        tradeOrderPara.setEndTime(LocalDateTimeUtil.parse(orderPara.getEndTime(), "yyyy-MM-dd HH:mm:ss"));
+        tradeOrderPara.setUserId(orderPara.getUserId());
+        tradeOrderPara.setOrderNo(orderPara.getOrderNo());
+        tradeOrderPara.setLogisticsOrderNo(orderPara.getLogisticsOrderNo());
+        return logisticsConsignmentService.queryMcpList(tradeOrderPara);
+    }
+
+    @PostMapping(value = "/base")
+    @Operation(summary = "分页查询物流订单概要信息", description = "分页查询物流订单概要信息")
+    public List<LogisticsBaseOrderVo> base(@RequestBody OrderPara orderPara) {
+        LogisticsOrderPara tradeOrderPara = new LogisticsOrderPara();
+        tradeOrderPara.setStartTime(LocalDateTimeUtil.parse(orderPara.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
+        tradeOrderPara.setEndTime(LocalDateTimeUtil.parse(orderPara.getEndTime(), "yyyy-MM-dd HH:mm:ss"));
+        tradeOrderPara.setUserId(orderPara.getUserId());
+        return logisticsConsignmentService.queryBaseList(tradeOrderPara);
+    }
+
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderMapper.java

@@ -2,7 +2,9 @@ package com.sckw.transport.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.mongo.model.TableTops;
+import com.sckw.transport.api.model.LogisticsBaseOrderVo;
 import com.sckw.transport.api.model.dto.AcceptCarriageLogisticsOrderDto;
+import com.sckw.transport.api.model.dto.McpLogisticsOrderVo;
 import com.sckw.transport.api.model.vo.LogisticsOrderVO;
 import com.sckw.transport.model.KwtLogisticsOrder;
 import com.sckw.transport.model.LogisticsOrderPara;
@@ -475,7 +477,7 @@ public interface KwtLogisticsOrderMapper extends BaseMapper<KwtLogisticsOrder> {
      **/
     LogisticsCountVo findLogisticsOrderCount(Map<String, Object> params);
 
-    List<LogisticsOrderVo> selectData(@Param("para") LogisticsOrderPara orderPara);
+    List<McpLogisticsOrderVo> selectData(@Param("para") LogisticsOrderPara orderPara);
 
     Long queryCount(@Param("ids") List<Long> ids);
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtLogisticsConsignmentService.java

@@ -49,6 +49,9 @@ import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.RemoteUserService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.UserResDto;
+import com.sckw.transport.api.model.LogisticsBaseOrderVo;
+import com.sckw.transport.api.model.dto.McpLogisticsOrderVo;
+import com.sckw.transport.api.model.dto.OrderUrl;
 import com.sckw.transport.common.config.MessageUrlConfig;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
@@ -3671,7 +3674,8 @@ public class KwtLogisticsConsignmentService {
     }
 
 
-    public List<LogisticsOrderVo> queryList(LogisticsOrderPara orderPara) {
+
+    public List<McpLogisticsOrderVo> queryMcpList(LogisticsOrderPara orderPara) {
         UserResDto userResDto = remoteSystemService.queryUserById(orderPara.getUserId());
         if (Objects.nonNull(userResDto)) {
             orderPara.setType(userResDto.getType());
@@ -3681,7 +3685,7 @@ public class KwtLogisticsConsignmentService {
             }
         }
 
-        List<LogisticsOrderVo> list = kwtLogisticsOrderMapper.selectData(orderPara);
+        List<McpLogisticsOrderVo> list = kwtLogisticsOrderMapper.selectData(orderPara);
         if (CollUtil.isNotEmpty(list)) {
             list.forEach(d -> {
                 GoodsDetails detailById = goodsInfoService.getDetail(d.getGoodsId());

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -2951,7 +2951,7 @@
         </if>
     </select>
 
-    <select id="selectData" resultType="com.sckw.transport.model.vo.LogisticsOrderVo">
+    <select id="selectData" resultType="com.sckw.transport.api.model.dto.McpLogisticsOrderVo">
         select a.id                                  as lOrderId,
                a.t_order_id                          AS tOrderId,
                a.l_order_no                          AS lOrderNo,
@@ -3009,7 +3009,7 @@
             limit 10
         </where>
     </select>
-    <select id="selectBase" resultType="com.sckw.transport.model.vo.LogisticsBaseOrderVo">
+    <select id="selectBase" resultType="com.sckw.transport.api.model.LogisticsBaseOrderVo">
         select count(1)                                   as count,
                d.firm_name                                as tyFirmName,
                e.firm_name                                as cyFirmName,
@@ -3043,7 +3043,7 @@
                     </if>
                 </if>
             </if>
-            group by d.ent_id, e.ent_id
+            group by d.ent_id, e.ent_id,d.firm_name, e.firm_name
         </where>
     </select>