Merge branch 'dev_20251130' of https://git.sckaiwu.cn/kaiwu-rep/sckw-service-platform into dev_20251130

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

@@ -0,0 +1,25 @@
+package com.sckw.order.api.model;
+
+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-api/sckw-order-api/src/main/java/com/sckw/order/api/model/TradeOrderVo.java

@@ -2,7 +2,6 @@ package com.sckw.order.api.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -19,11 +18,15 @@ public class TradeOrderVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 6909518527687999256L;
-    @Schema(description = "跳转链接")
-    private String url;
+    private Long tOrderId;
+
+    @JsonProperty("tOrderNoUrl")
+    private OrderUrl tOrderNoUrl;
+
 
     private Integer status;
     private String statusLabel;
+
     @JsonProperty("tOrderNo")
     private String tOrderNo;
     /**

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -2572,7 +2572,7 @@ public class KwoTradeOrderService {
                 chargeTypeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
             }
             tradeOrderVos.forEach(d -> {
-                d.setUrl("/logisticsOrder");
+                d.setTOrderNoUrl(new OrderUrl(d.getTOrderNo(), "/#/orderManagement/tradeOrder/detail/" + d.getTOrderId()));
                 d.setStatusLabel(statusMap.get(String.valueOf(d.getStatus())));
                 d.setGoodsTypeLabel(productNameMap.get(d.getGoodsType()));
                 d.setChargeTypeLabel(chargeTypeMap.get(String.valueOf(d.getChargeType())));

sckw-modules/sckw-order/src/main/resources/mapper/KwoTradeOrderMapper.xml

@@ -734,6 +734,7 @@
 
     <select id="selectData" resultType="com.sckw.order.api.model.TradeOrderVo">
         select a.status,
+               a.id         tOrderId,
                a.t_order_no tOrderNo,
                d.firm_name  buyEntName,
                e.firm_name  sellEntName,
@@ -831,7 +832,7 @@
                        ':00-',
                        LPAD(MOD(HOUR(kto.create_time) + 1, 24), 2, '0'),
                        ':00'
-                   ) AS time_period,
+                   )           AS time_period,
                sum(kto.amount) as amount
         from kwo_trade_order kto
                  inner JOIN kwo_trade_order_unit d ON kto.id = d.t_order_id AND d.unit_type = '2' AND d.del_flag = 0

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

@@ -144,10 +144,10 @@ public class KwHomeService {
         Long aLong = tradeOrderInfoService.orderCount();
         Long aLong1 = transportRemoteService.queryCount();
         TodoCountVo todoCountVo = new TodoCountVo();
-        todoCountVo.setTradeContractCount(new ViewUrl(contractCountVo.getTradeContractCount(), "/contractManagement/tradeContract/list"));
-        todoCountVo.setLogisticsContractCount(new ViewUrl(contractCountVo.getLogisticsContractCount(), "/contractManagement/logisticsContract/list"));
-        todoCountVo.setTradeOrderCount(new ViewUrl(aLong, "/orderManagement/tradeOrder/list"));
-        todoCountVo.setLogisticsOrderCount(new ViewUrl(aLong1, "/operatManagement/logisticsWaybill/list"));
+        todoCountVo.setTradeContractCount(new ViewUrl(contractCountVo.getTradeContractCount(), "/#/contractManagement/tradeContract/list"));
+        todoCountVo.setLogisticsContractCount(new ViewUrl(contractCountVo.getLogisticsContractCount(), "/#/contractManagement/logisticsContract/list"));
+        todoCountVo.setTradeOrderCount(new ViewUrl(aLong, "/#/orderManagement/tradeOrder/list"));
+        todoCountVo.setLogisticsOrderCount(new ViewUrl(aLong1, "/#/operatManagement/logisticsWaybill/list"));
         return todoCountVo;
     }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/LogisticsOrderVo.java

@@ -2,6 +2,7 @@ package com.sckw.transport.model.vo;
 
 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;
@@ -19,12 +20,21 @@ public class LogisticsOrderVo implements Serializable {
     @JsonProperty("tOrderId")
     private Long tOrderId;
 
+    @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;

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

@@ -3683,6 +3683,8 @@ public class KwtLogisticsConsignmentService {
                 if (Objects.nonNull(detailById)) {
                     d.setGoodsName(d.getGoodsName() + detailById.getSpecLabel());
                 }
+                d.setLOrderNoUrl(new OrderUrl(d.getLOrderNo(),"/#/operatManagement/logisticsOrder/detail/" + d.getLOrderId()));
+                d.setTOrderNoUrl(new OrderUrl(d.getTOrderNo(),"/#/orderManagement/tradeOrder/detail/" + d.getTOrderId()));
                 d.setStatusLabel(LogisticsOrderV1Enum.getDesc(d.getStatus()));
             });
             return list;

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

@@ -2952,7 +2952,8 @@
     </select>
 
     <select id="selectData" resultType="com.sckw.transport.model.vo.LogisticsOrderVo">
-        select a.id,
+        select a.id                                  as lOrderId,
+               a.t_order_id                          AS tOrderId,
                a.l_order_no                          AS lOrderNo,
                a.t_order_no                          AS tOrderNo,
                a.amount,