From f774a91be6fbafa31865c591013ecba4e9f939f1 Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期二, 10 十二月 2024 15:47:52 +0800 Subject: [PATCH] 1. --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 8 +++++--- 1 files changed, 5 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 0cfe66e..3938eb7 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 @@ -86,7 +86,7 @@ return R.fail("售后取消失败"); } refundPass.setDelFlag(1); - refundPassService.updateById(refundPass); + refundPassService.removeById(id); order.setOrderStatus(4); orderService.updateById(order); return R.ok(); @@ -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(); @@ -113,6 +114,7 @@ return R.fail("操作失败"); } refundPass.setStatus(5); + refundPass.setCode(code); refundPassService.updateById(refundPass); return R.ok(); } -- Gitblit v1.7.1