xucaiqin hai 22 horas
pai
achega
c550501919

+ 25 - 0
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;
+
+}

+ 5 - 3
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,14 @@ public class TradeOrderVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 6909518527687999256L;
-    @Schema(description = "跳转链接")
-    private String url;
+
+    @JsonProperty("tOrderNoUrl")
+    private OrderUrl tOrderNoUrl;
+
 
     private Integer status;
     private String statusLabel;
+
     @JsonProperty("tOrderNo")
     private String tOrderNo;
     /**

+ 1 - 1
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/list"));
                 d.setStatusLabel(statusMap.get(String.valueOf(d.getStatus())));
                 d.setGoodsTypeLabel(productNameMap.get(d.getGoodsType()));
                 d.setChargeTypeLabel(chargeTypeMap.get(String.valueOf(d.getChargeType())));

+ 7 - 0
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;
@@ -22,9 +23,15 @@ public class LogisticsOrderVo implements Serializable {
     @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;

+ 2 - 0
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/list"));
+                d.setTOrderNoUrl(new OrderUrl(d.getTOrderNo(),"/orderManagement/tradeOrder/list"));
                 d.setStatusLabel(LogisticsOrderV1Enum.getDesc(d.getStatus()));
             });
             return list;