From 257d66798aa538f8737980f13d94c547bf0b51ea Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 125 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 116 insertions(+), 9 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 893ae60..fafbf08 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,21 +1,38 @@
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;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.model.Order;
import com.ruoyi.order.model.RefundPass;
import com.ruoyi.order.service.OrderService;
import com.ruoyi.order.service.RefundPassService;
-import com.ruoyi.order.vo.ApplyRefundPass;
+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;
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;
/**
* <p>
@@ -27,7 +44,7 @@
*/
@RestController
@RequestMapping("/refund-pass")
-public class RefundPassController {
+public class RefundPassController extends BaseController {
@Resource
@@ -38,6 +55,12 @@
@Resource
private OrderService orderService;
+
+ @Resource
+ private RedisTemplate redisTemplate;
+
+ @Resource
+ private SystemConfigClient systemConfigClient;
@ResponseBody
@@ -61,7 +84,16 @@
}
RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderId)
.eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1"));
+ if(null == one){
+ return R.fail("无效的售后数据");
+ }
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);
}
@@ -85,23 +117,23 @@
if(Arrays.asList(2, 3).contains(refundPass.getStatus())){
return R.fail("售后取消失败");
}
-// refundPass.setDelFlag(1);
- refundPassService.removeById(id);
- order.setOrderStatus(4);
+ refundPass.setDelFlag(1);
+ refundPassService.updateById(refundPass);
+ order.setOrderStatus(order.getOldOrderStatus());
orderService.updateById(order);
return R.ok();
}
@ResponseBody
- @PutMapping("/deliverGoodsRefundPass/{id}/{code}")
+ @PostMapping("/deliverGoodsRefundPass")
@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, @PathVariable("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();
}
@@ -114,10 +146,85 @@
return R.fail("操作失败");
}
refundPass.setStatus(5);
- refundPass.setCode(code);
+ 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();
}
+
+
+ @ResponseBody
+ @GetMapping("/getOrderRefundPassList")
+ @ApiOperation(value = "获取售后列表数据", tags = {"管理后台-售后管理", "门店后台-售后管理"})
+ public R<PageInfo<OrderRefundPassList>> getOrderRefundPassList(OrderRefundPassListVo refundPassListVo){
+ return R.ok(refundPassService.getOrderRefundPassList(refundPassListVo));
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/authPassStatus")
+ @ApiOperation(value = "审核售后", tags = {"管理后台-售后管理", "门店后台-售后管理"})
+ public R authPassStatus(@RequestBody AuthPassStatus authPassStatus){
+ return refundPassService.authPassStatus(authPassStatus.getId(), authPassStatus.getStatus(), authPassStatus.getPassRemark());
+ }
+
+
+ @ResponseBody
+ @PutMapping("/refundPassReceive/{id}")
+ @ApiOperation(value = "售后确认收货操作", tags = {"管理后台-售后管理"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
+ })
+ public R refundPassReceive(@PathVariable("id") Long id){
+ return refundPassService.refundPassReceive(id);
+ }
+
+
+
+ @ResponseBody
+ @GetMapping("/getRefundPassInfo/{id}")
+ @ApiOperation(value = "获取售后数据详情", tags = {"管理后台-售后管理", "门店后台-售后管理"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
+ })
+ public R<RefundPassInfo> getRefundPassInfo(@PathVariable("id") Long id){
+ RefundPassInfo refundPassInfo = refundPassService.getRefundPassInfo(id);
+ return R.ok(refundPassInfo);
+ }
+
+
+
+ /**
+ * 获取订单快递明细
+ * @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