From 156a360b349648adb7d92e551720ce787dbbfe27 Mon Sep 17 00:00:00 2001 From: pbvfus8to <480171784@qq.com> Date: Wed, 18 Dec 2024 10:44:06 +0800 Subject: [PATCH] Update DeliveryController.java --- .../api/controller/DeliveryController.java | 63 ------------------- 1 file changed, 63 deletions(-) diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/DeliveryController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/DeliveryController.java index 64b9060..e69de29 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/DeliveryController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/DeliveryController.java @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. - * - * https://www.mall4j.com/ - * - * 未经允许,不可做商业用途! - * - * 版权所有,侵权必究! - */ - -package com.yami.shop.api.controller; - -import com.yami.shop.service.OrderService; -import org.springframework.beans.factory.annotation.Autowired; -import com.yami.shop.common.response.ServerResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.yami.shop.bean.app.dto.DeliveryDto; -import com.yami.shop.bean.model.Delivery; -import com.yami.shop.bean.model.Order; -import com.yami.shop.common.util.Json; -import com.yami.shop.service.DeliveryService; - -import cn.hutool.http.HttpUtil; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -/** - * @author lanhai - */ -@RestController -@RequestMapping("/delivery") -@Tag(name = "查看物流接口") -public class DeliveryController { - - @Autowired - private DeliveryService deliveryService; - @Autowired - private OrderService orderService; - - /** - * 查看物流接口 - */ - @GetMapping("/check") - @Operation(summary = "查看物流" , description = "根据订单号查看物流") - @Parameter(name = "orderNumber", description = "订单号" , required = true) - public ServerResponseEntity checkDelivery(String orderNumber) { - - Order order = orderService.getOrderByOrderNumber(orderNumber); - Delivery delivery = deliveryService.getById(order.getDvyId()); - String url = delivery.getQueryUrl().replace("{dvyFlowId}", order.getDvyFlowId()); - String deliveryJson = HttpUtil.get(url); - - DeliveryDto deliveryDto = Json.parseObject(deliveryJson, DeliveryDto.class); - deliveryDto.setDvyFlowId(order.getDvyFlowId()); - deliveryDto.setCompanyHomeUrl(delivery.getCompanyHomeUrl()); - deliveryDto.setCompanyName(delivery.getDvyName()); - return ServerResponseEntity.success(deliveryDto); - } -}