From 6936e2439bb5426d6c446ec30c2d27a7db8e890d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 11:20:50 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 2bb8ac1..e345abc 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
@@ -19,6 +19,7 @@
import javax.annotation.Resource;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
/**
@@ -66,6 +67,7 @@
RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderId)
.eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1"));
one.setIdStr(one.getId().toString());
+ one.setAddressJson(order.getAddressJson());
return R.ok(one);
}
@@ -104,8 +106,8 @@
@ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
@ApiImplicitParam(name = "code", value = "快递单号", required = true, dataType = "string"),
})
- public R deliverGoodsRefundPass(@RequestParam("id") String id, @RequestParam("code") String code){
- RefundPass refundPass = refundPassService.getById(id);
+ public R deliverGoodsRefundPass(@RequestBody DeliverGoodsRefundPass pass){
+ RefundPass refundPass = refundPassService.getById(pass.getId());
if(null == refundPass){
return R.fail();
}
@@ -118,7 +120,7 @@
return R.fail("操作失败");
}
refundPass.setStatus(5);
- refundPass.setCode(code);
+ refundPass.setCode(pass.getCode());
refundPassService.updateById(refundPass);
return R.ok();
}
@@ -131,7 +133,8 @@
public R<PageInfo<OrderRefundPassList>> getOrderRefundPassList(OrderRefundPassListVo refundPassListVo){
return R.ok(refundPassService.getOrderRefundPassList(refundPassListVo));
}
-
+
+
@ResponseBody
@PostMapping("/authPassStatus")
--
Gitblit v1.7.1