From fc3c206439297fedc116e5a05aff799529e93e99 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 19:58:10 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 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 a53dea7..7aa173e 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
@@ -1,8 +1,12 @@
package com.ruoyi.order.controller;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.account.api.model.UserAddress;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.core.web.page.TableDataInfo;
@@ -11,13 +15,20 @@
import com.ruoyi.order.model.RefundPass;
import com.ruoyi.order.service.OrderService;
import com.ruoyi.order.service.RefundPassService;
+import com.ruoyi.order.util.ExpressDeliveryUtil;
+import com.ruoyi.order.util.vo.MapTrackKD100Vo;
import com.ruoyi.order.vo.*;
+import com.ruoyi.other.api.domain.SystemConfig;
+import com.ruoyi.other.api.feignClient.SystemConfigClient;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -43,6 +54,12 @@
@Resource
private OrderService orderService;
+
+ @Resource
+ private RedisTemplate redisTemplate;
+
+ @Resource
+ private SystemConfigClient systemConfigClient;
@ResponseBody
@@ -121,6 +138,20 @@
}
refundPass.setStatus(5);
refundPass.setCode(pass.getCode());
+
+ //添加查询快递信息队列
+ //一小时后定时查询快递信息
+ SystemConfig systemConfig = systemConfigClient.getSystemConfig(3).getData();
+ JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
+ Integer waitTime = jsonObject.getInteger("waitTime");
+ redisTemplate.opsForZSet().add("order_refund_express", refundPass.getId(), LocalDateTime.now().plusHours(waitTime).toEpochSecond(ZoneOffset.UTC));
+
+ JSONObject jsonObject1 = JSON.parseObject(pass.getCode());
+ String com = jsonObject1.getString("com");
+ String num = jsonObject1.getString("num");
+ UserAddress userAddress = JSON.parseObject(order.getAddressJson(), UserAddress.class);
+ MapTrackKD100Vo mapTrackKD100Vo = ExpressDeliveryUtil.kd100MapTrack(com, num, userAddress.getProvince() + userAddress.getCity(), order.getDeliverProvince() + order.getDeliverCity());
+ refundPass.setExpressResult(JSON.toJSONString(mapTrackKD100Vo));
refundPassService.updateById(refundPass);
return R.ok();
}
@@ -168,5 +199,23 @@
}
+
+ /**
+ * 获取订单快递明细
+ * @param id
+ * @return
+ */
+ @GetMapping("/getOrderExpress/{id}")
+ @ApiOperation(value = "获取售后订单快递明细", tags = {"小程序-订单管理"})
+ public R<MapTrackKD100Vo> getOrderExpress(@PathVariable("id") Long id){
+ RefundPass refundPass = refundPassService.getById(id);
+ String expressResult = refundPass.getExpressResult();
+ if(StringUtils.isNotEmpty(expressResult)){
+ MapTrackKD100Vo mapTrackKD100Vo = JSON.parseObject(expressResult, MapTrackKD100Vo.class);
+ return R.ok(mapTrackKD100Vo);
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1