From 3ed7fcd25a5233a8fc1a00e5602e89e92ebe82ae Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 十二月 2024 10:58:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
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 2085ad3..94c893a 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
@@ -60,7 +60,7 @@
return R.fail("权限不足");
}
RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderId)
- .eq(RefundPass::getDelFlag, 0).last(" order by createTime desc limit 0,1"));
+ .eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1"));
one.setIdStr(one.getId().toString());
return R.ok(one);
}
@@ -94,12 +94,13 @@
@ResponseBody
- @PutMapping("/deliverGoodsRefundPass/{id}")
+ @PutMapping("/deliverGoodsRefundPass/{id}/{code}")
@ApiOperation(value = "售后已发货操作", tags = {"我的订单-个人中心-小程序"})
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
+ @ApiImplicitParam(name = "code", value = "快递单号", required = true, dataType = "string"),
})
- public R deliverGoodsRefundPass(@PathVariable("id") Long id){
+ public R deliverGoodsRefundPass(@PathVariable("id") Long id, @PathVariable("code") String code){
RefundPass refundPass = refundPassService.getById(id);
if(null == refundPass){
return R.fail();
--
Gitblit v1.7.1