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 c61b1f047..10e482bed 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 @@ -252,6 +252,9 @@ public class StoreOrderPageItemVO extends StoreOrderDTO { @ApiModelProperty(value = "平台介入结果") private String platformInvolveResult; + @ApiModelProperty(value = "平台发货标识") + private Boolean shipByPlatformFlag; + @ApiModelProperty(value = "物流运单号(快递单号)信息集合") private List expressWaybillNoInfos; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderPageItemDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderPageItemDTO.java index e7733af2b..a004744d2 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderPageItemDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderPageItemDTO.java @@ -32,6 +32,8 @@ public class StoreOrderPageItemDTO extends StoreOrderDTO { private String destinationCountyName; + private Boolean shipByPlatformFlag; + private List orderDetails; private List expressWaybillNoInfos; 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 218ee997c..d2eee560c 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 @@ -579,6 +579,7 @@ public class StoreOrderServiceImpl implements IStoreOrderService { order.setOriginCountyName(regionMap.get(order.getOriginCountyCode())); order.setOrderDetails(orderDetailGroup.get(order.getId())); Set expressWaybillNoInfos = new LinkedHashSet<>(); + boolean shipByPlatformFlag = false; for (StoreOrderDetailInfoDTO detail : order.getOrderDetails()) { //首图 detail.setFirstMainPicUrl(mainPicMap.get(detail.getStoreProdId())); @@ -590,8 +591,12 @@ public class StoreOrderServiceImpl implements IStoreOrderService { expressWaybillNoInfos.add(new ExpressWaybillNoInfoDTO(eId, eName, no)); } } + if (EExpressType.PLATFORM.getValue().equals(detail.getExpressType())) { + shipByPlatformFlag = true; + } } order.setExpressWaybillNoInfos(new ArrayList<>(expressWaybillNoInfos)); + order.setShipByPlatformFlag(shipByPlatformFlag); } } return list;