From 78a7217d87c2d2129019a89f11c6802bce03b103 Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期一, 09 十二月 2024 09:32:51 +0800 Subject: [PATCH] 1. --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java index 92505e4..013e8ec 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java @@ -6,12 +6,12 @@ import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.common.security.service.TokenService; +import com.ruoyi.order.model.Order; import com.ruoyi.order.service.OrderService; -import io.swagger.annotations.*; -import org.springframework.web.bind.annotation.*; import com.ruoyi.order.vo.OrderDetailVO; import com.ruoyi.system.api.model.LoginUser; -import com.ruoyi.order.model.Order; +import io.swagger.annotations.*; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -90,9 +90,9 @@ @ApiImplicitParams({ @ApiImplicitParam(value = "订单号", name = "code", required = true, dataType = "String"), }) - @GetMapping("/writeOff/{code}") - public R<Void> writeOff(@PathVariable("code") String code){ - // TODO 待完善 + @GetMapping("/writeOff/{code}/{shopId}") + public R<Void> writeOff(@PathVariable("code") String code, @PathVariable("shopId") Integer shopId){ + orderService.writeOff(code, shopId); return R.ok(); } -- Gitblit v1.7.1