diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java index 72d4e27b5..60f954a60 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java @@ -516,6 +516,9 @@ public class StoreOrderInfoVO { @ApiModelProperty(value = "平台介入结果") private String platformInvolveResult; + @ApiModelProperty(value = "物流名称") + private String expressName; + } @ApiModel diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java index 84bc0865c..cc829d60d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java @@ -493,5 +493,8 @@ public class StoreOrderPageItemVO extends StoreOrderDTO { @ApiModelProperty(value = "退货原商品数量") private Integer originGoodsQuantity; + + @ApiModelProperty(value = "物流名称") + private String expressName; } } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDetailInfoDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDetailInfoDTO.java index c7f1afa88..4a7655dc7 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDetailInfoDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDetailInfoDTO.java @@ -38,4 +38,6 @@ public class StoreOrderDetailInfoDTO extends StoreOrderDetailDTO { private String storeName; private String storeAddress; + + private String expressName; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java index 86aaf8254..48ce23d06 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java @@ -421,6 +421,7 @@ public class StoreOrderServiceImpl implements IStoreOrderService { String[] nos = detailInfo.getExpressWaybillNo().split(","); Long eId = detailInfo.getExpressId(); String eName = expressMap.get(eId); + detailInfo.setExpressName(eName); for (String no : nos) { expressWaybillNoInfos.add(new ExpressWaybillNoInfoDTO(eId, eName, no)); } @@ -598,6 +599,7 @@ public class StoreOrderServiceImpl implements IStoreOrderService { String[] nos = detail.getExpressWaybillNo().split(","); Long eId = detail.getExpressId(); String eName = expressMap.get(eId); + detail.setExpressName(eName); for (String no : nos) { expressWaybillNoInfos.add(new ExpressWaybillNoInfoDTO(eId, eName, no)); }