diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java index 88f5b0c..83949b6 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java @@ -105,6 +105,9 @@ public class TradeOrderBaseVO { @Schema(description = "发货物流单号", example = "1024") private String logisticsNo; + @Schema(description = "发货物流面单短链", example = "1024") + private String logisticsLabel; + @Schema(description = "发货时间") private LocalDateTime deliveryTime; diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java index bd6ed90..be91e38 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java @@ -210,6 +210,12 @@ public class TradeOrderDO extends BaseDO { * 如果无需发货,则 logisticsNo 设置 ""。原因是,不想再添加额外字段 */ private String logisticsNo; + /** + * 发货物流面单短链 + * + * 如果无需发货,则 logisticsLabel 设置 ""。原因是,不想再添加额外字段 + */ + private String logisticsLabel; /** * 发货时间 */ diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java index c15770a..f9cb906 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java @@ -628,7 +628,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { orderReq.setRecMan(recManInfo); // orderReq.setPrintType(PrintType.CLOUD); - orderReq.setPrintType(PrintType.HTML); + orderReq.setPrintType(PrintType.IMAGE); String param = new Gson().toJson(orderReq); String t = System.currentTimeMillis() + ""; @@ -657,7 +657,9 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { //快递单号 deliveryReqVO.setLogisticsNo(result.getData().getKuaidinum()); DeliveryExpressDO express = deliveryExpressService.validateDeliveryExpress(deliveryReqVO.getLogisticsId()); - updateOrderObj.setLogisticsId(deliveryReqVO.getLogisticsId()).setLogisticsNo(deliveryReqVO.getLogisticsNo()); + updateOrderObj.setLogisticsId(deliveryReqVO.getLogisticsId()) + .setLogisticsNo(deliveryReqVO.getLogisticsNo()) + .setLogisticsLabel(result.getData().getLabel()); // 执行更新 updateOrderObj.setStatus(TradeOrderStatusEnum.DELIVERED.getStatus()).setDeliveryTime(LocalDateTime.now());