Просмотр исходного кода

fix: 完善查看更多跳转问题

xucaiqin 4 месяцев назад
Родитель
Сommit
a8182fff04

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

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

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

@@ -2574,6 +2574,7 @@ public class KwoTradeOrderService {
                 chargeTypeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
             }
             tradeOrderVos.forEach(d -> {
+                d.setMoreUrl("/#/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()));

+ 1 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/LogisticsBaseOrderVo.java

@@ -13,6 +13,7 @@ public class LogisticsBaseOrderVo implements Serializable {
     private static final long serialVersionUID = 4964311980474791569L;
     private String tyFirmName;
     private String cyFirmName;
+    private String moreUrl;
 
     private Integer count;
     private BigDecimal amount;

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

@@ -16,6 +16,7 @@ public class LogisticsOrderVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 4964311980474791569L;
     private Long id;
+    private String moreUrl;
 
     @JsonProperty("tOrderId")
     private Long tOrderId;

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

@@ -2577,7 +2577,11 @@ public class KwtLogisticsConsignmentService {
             }
         }
 
-        return kwtLogisticsOrderMapper.selectBase(orderPara);
+        List<LogisticsBaseOrderVo> logisticsBaseOrderVos = kwtLogisticsOrderMapper.selectBase(orderPara);
+        if (CollUtil.isNotEmpty(logisticsBaseOrderVos)) {
+            logisticsBaseOrderVos.forEach(d -> d.setMoreUrl("/#/operatManagement/logisticsOrder/list"));
+        }
+        return logisticsBaseOrderVos;
     }
 
     /**
@@ -3683,8 +3687,9 @@ 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.setMoreUrl("/#/operatManagement/logisticsOrder/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;