跳转地址修改

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

@@ -18,6 +18,7 @@ public class TradeOrderVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 6909518527687999256L;
+    private Long tOrderId;
 
     @JsonProperty("tOrderNoUrl")
     private OrderUrl tOrderNoUrl;

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.setTOrderNoUrl(new OrderUrl(d.getTOrderNo(), "/#/orderManagement/tradeOrder/list"));
+                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-transport/src/main/java/com/sckw/transport/model/vo/LogisticsOrderVo.java

@@ -20,6 +20,9 @@ public class LogisticsOrderVo implements Serializable {
     @JsonProperty("tOrderId")
     private Long tOrderId;
 
+    @JsonProperty("lOrderId")
+    private Long lOrderId;
+
     @JsonProperty("lOrderNo")
     private String lOrderNo;
 

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

@@ -3683,8 +3683,8 @@ public class KwtLogisticsConsignmentService {
                 if (Objects.nonNull(detailById)) {
                     d.setGoodsName(d.getGoodsName() + detailById.getSpecLabel());
                 }
-                d.setLOrderNoUrl(new OrderUrl(d.getLOrderNo(),"/#/orderManagement/tradeOrder/list"));
-                d.setTOrderNoUrl(new OrderUrl(d.getTOrderNo(),"/#/orderManagement/tradeOrder/list"));
+                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,