From 00565c78624bf079ff7613d19ab7d83f64d331bd Mon Sep 17 00:00:00 2001 From: OPGame <1242479791@qq.com> Date: Fri, 23 Aug 2019 10:28:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E5=BA=97=E9=93=BA=E9=85=8D=E9=80=81?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E5=BC=8F,=20=E4=B8=94=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E8=BF=90=E8=B4=B9=E6=A8=A1=E6=9D=BF=EF=BC=8C=E6=89=8D=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E8=BF=90=E8=B4=B9=E6=A8=A1=E6=9D=BF=E7=9A=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E4=BE=9B=E5=89=8D=E7=AB=AF=E6=9F=A5=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yami/shop/api/controller/ProdController.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java index 6a73e1f..68e8904 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java @@ -16,6 +16,7 @@ import com.yami.shop.bean.app.dto.TagProductDto; import com.yami.shop.bean.model.Product; import com.yami.shop.bean.model.Sku; import com.yami.shop.bean.model.Transport; +import com.yami.shop.common.util.Json; import com.yami.shop.common.util.PageParam; import com.yami.shop.service.ProductService; import com.yami.shop.service.SkuService; @@ -79,8 +80,16 @@ public class ProdController { List useSkuList = skuList.stream().filter(sku -> sku.getStatus() == 1).collect(Collectors.toList()); product.setSkuList(useSkuList); ProductDto productDto = mapperFacade.map(product, ProductDto.class); - Transport transportAndAllItems = transportService.getTransportAndAllItems(product.getDeliveryTemplateId()); - productDto.setTransport(transportAndAllItems); + + + // 商品的配送方式 + Product.DeliveryModeVO deliveryModeVO = Json.parseObject(product.getDeliveryMode(), Product.DeliveryModeVO.class); + // 有店铺配送的方式, 且存在运费模板，才返回运费模板的信息，供前端查阅 + if (deliveryModeVO.getHasShopDelivery() && product.getDeliveryTemplateId() != null) { + Transport transportAndAllItems = transportService.getTransportAndAllItems(product.getDeliveryTemplateId()); + productDto.setTransport(transportAndAllItems); + } + return ResponseEntity.ok(productDto); }