From fd45fcbd496bbeaf9ee18edd8f2f858cf9cebaf3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:47:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 7078489..87690b2 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
@@ -92,7 +92,7 @@
if(StringUtils.isNotEmpty(one.getExpressResult())){
MapTrackKD100Vo mapTrackKD100Vo = JSON.parseObject(one.getExpressResult(), MapTrackKD100Vo.class);
List<QueryKD100ListVo> data = mapTrackKD100Vo.getData();
- one.setExpress(data.size() > 0 ? data.get(0).getContext() : "");
+ one.setExpress(null != data && data.size() > 0 ? data.get(0).getContext() : "");
}
return R.ok(one);
}
@@ -114,7 +114,7 @@
if(!order.getAppUserId().equals(userid)){
return R.fail("权限不足");
}
- if(Arrays.asList(2, 3).contains(refundPass.getStatus())){
+ if(refundPass.getStatus().equals(2)){
return R.fail("售后取消失败");
}
refundPass.setDelFlag(1);
--
Gitblit v1.7.1