From 8dfa9f67a2505731910b4fb3933bb38b0869ab2d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 14:33:23 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 17 +++++++----------
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 8 ++++----
2 files changed, 11 insertions(+), 14 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 de0971d..3a6b22c 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
@@ -54,7 +54,7 @@
*/
@ApiOperation(value = "我的订单列表", tags = {"小程序-个人中心-我的订单"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单状态", name = "status", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单状态", name = "status", required = true, dataType = "int", paramType="query"),
})
@GetMapping("/getMyOrderList")
public TableDataInfo<OrderVO> getMyOrderList(@ApiParam("订单状态") Integer status){
@@ -76,7 +76,7 @@
*/
@ApiOperation(value = "订单详情", tags = {"小程序-个人中心-我的订单-订单详情"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int", paramType="query"),
})
@GetMapping("/detail/{orderId}")
public R<OrderDetailVO> detail(@PathVariable("orderId") Long orderId){
@@ -103,7 +103,7 @@
*/
@ApiOperation(value = "订单核销", tags = {"小程序-个人中心-门店管理"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单号", name = "code", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "订单号", name = "code", required = true, dataType = "String", paramType="query"),
})
@GetMapping("/writeOff/{code}/{shopId}")
public R<Void> writeOff(@PathVariable("code") String code, @PathVariable("shopId") Integer shopId){
@@ -116,7 +116,7 @@
*/
@ApiOperation(value = "取消订单", tags = {"小程序-个人中心-我的订单"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int", paramType="query"),
})
@GetMapping("/cancel/{orderId}")
public R<Void> cancel(@PathVariable("orderId") Long orderId){
@@ -131,7 +131,7 @@
*/
@ApiOperation(value = "确认收货", tags = {"小程序-个人中心-我的订单"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int", paramType="query"),
})
@GetMapping("/confirm/{orderId}")
public R<Void> confirm(@PathVariable("orderId") Long orderId){
@@ -162,7 +162,7 @@
*/
@ApiOperation(value = "更换收货地址", tags = {"小程序-个人中心-我的订单"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int", paramType="query"),
})
@GetMapping("/changeAddress")
public R<Void> changeAddress(@RequestParam("orderId") Long orderId, @RequestParam("addressId") Long addressId){
@@ -182,9 +182,6 @@
* 更新订单状态
*/
@ApiOperation(value = "更新订单状态", tags = {"后台-订单管理"})
- @ApiImplicitParams({
- @ApiImplicitParam(value = "订单对象", name = "order", required = true, dataType = "Order"),
- })
@PostMapping("/updateOrderStatus")
public R<Void> updateOrderStatus(@RequestBody Order order){
Order order1 = orderService.getById(order.getId());
@@ -198,7 +195,7 @@
* 预约技师
*/
@PostMapping("/subscribe")
- public R<Void> subscribe(@RequestParam(value = "id", required = false) Long id ,@RequestParam(value = "technicianId", required = false) Integer technicianId){
+ public R<Void> subscribe(@RequestParam("id") Long id ,@RequestParam("technicianId") Integer technicianId){
Order order = orderService.getById(id);
order.setTechnicianId(technicianId);
orderService.updateById(order);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
index 2c2a3cc..82ca4f2 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
@@ -104,7 +104,7 @@
@ApiOperation(value = "售后已发货操作", tags = {"我的订单-个人中心-小程序"})
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
- @ApiImplicitParam(name = "code", value = "快递单号", required = true, dataType = "string"),
+ @ApiImplicitParam(name = "code", value = "快递单号", required = true, dataType = "string")
})
public R deliverGoodsRefundPass(@PathVariable("id") Long id, @PathVariable("code") String code){
RefundPass refundPass = refundPassService.getById(id);
@@ -143,7 +143,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
@ApiImplicitParam(name = "status", value = "审核状态（2=同意，3=拒绝）", required = true, dataType = "int"),
- @ApiImplicitParam(name = "passRemark", value = "审核备注", required = false, dataType = "string"),
+ @ApiImplicitParam(name = "passRemark", value = "审核备注", required = false, dataType = "string")
})
public R authPassStatus(@PathVariable("id") Long id, @PathVariable("status") Integer status, @RequestParam("passRemark") String passRemark){
return refundPassService.authPassStatus(id, status, passRemark);
@@ -154,7 +154,7 @@
@PutMapping("/refundPassReceive/{id}")
@ApiOperation(value = "售后确认收货操作", tags = {"管理后台-售后管理"})
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
+ @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long")
})
public R refundPassReceive(@PathVariable("id") Long id){
return refundPassService.refundPassReceive(id);
@@ -166,7 +166,7 @@
@GetMapping("/getRefundPassInfo/{id}")
@ApiOperation(value = "获取售后数据详情", tags = {"管理后台-售后管理", "门店后台-售后管理"})
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
+ @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long")
})
public R<RefundPassInfo> getRefundPassInfo(@PathVariable("id") Long id){
RefundPassInfo refundPassInfo = refundPassService.getRefundPassInfo(id);
--
Gitblit v1.7.1