From d0b043b8fa5f19d1295cac50fece0c65fceb3920 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 17 一月 2025 17:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 1db9963..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
@@ -17,6 +17,7 @@
import com.ruoyi.order.service.RefundPassService;
import com.ruoyi.order.util.ExpressDeliveryUtil;
import com.ruoyi.order.util.vo.MapTrackKD100Vo;
+import com.ruoyi.order.util.vo.QueryKD100ListVo;
import com.ruoyi.order.vo.*;
import com.ruoyi.other.api.domain.SystemConfig;
import com.ruoyi.other.api.feignClient.SystemConfigClient;
@@ -88,6 +89,11 @@
}
one.setIdStr(one.getId().toString());
one.setAddressJson(order.getAddressJson());
+ if(StringUtils.isNotEmpty(one.getExpressResult())){
+ MapTrackKD100Vo mapTrackKD100Vo = JSON.parseObject(one.getExpressResult(), MapTrackKD100Vo.class);
+ List<QueryKD100ListVo> data = mapTrackKD100Vo.getData();
+ one.setExpress(null != data && data.size() > 0 ? data.get(0).getContext() : "");
+ }
return R.ok(one);
}
@@ -108,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