From e46155862879868751a13253675626d443650309 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 26 一月 2025 16:49:09 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java | 86 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 76 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
index 2dce3ef..c91e6bd 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
@@ -7,6 +7,7 @@
import com.kuaidi100.sdk.contant.CompanyConstant;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
+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.utils.bean.BeanUtils;
@@ -17,14 +18,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.BaseSetting;
+import com.ruoyi.other.api.domain.SystemConfig;
import com.ruoyi.other.api.feignClient.BaseSettingClient;
import com.ruoyi.other.api.feignClient.ShopClient;
+import com.ruoyi.other.api.feignClient.SystemConfigClient;
import com.ruoyi.other.api.feignClient.TechnicianClient;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.time.LocalDateTime;
@@ -32,6 +39,7 @@
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -58,6 +66,12 @@
@Resource
private SysUserClient sysUserClient;
+ @Resource
+ private RedisTemplate redisTemplate;
+
+ @Resource
+ private SystemConfigClient systemConfigClient;
+
@@ -80,7 +94,6 @@
if(null != afterSaleTime && LocalDateTime.now().isAfter(afterSaleTime)){
return R.fail("已超过售后期间");
}
-
//构建售后申请数据
RefundPass refundPass = new RefundPass();
refundPass.setOrderId(applyRefundPass.getId());
@@ -98,6 +111,7 @@
refundPass.setPhone(jsonObject.getString("phone"));
refundPass.setAddress(jsonObject.getString("address"));
this.save(refundPass);
+ order.setOldOrderStatus(order.getOrderStatus());
order.setOrderStatus(7);
orderService.updateById(order);
return R.ok();
@@ -117,18 +131,32 @@
shopId = sysUser.getObjectId();
}
List<Long> appUserIds = new ArrayList<>();
- //搜索条件，用户姓名
- if(StringUtils.isNotEmpty(refundPassListVo.getName())){
- List<AppUser> data = appUserClient.getAppUserByName(refundPassListVo.getName()).getData();
+ //搜索条件，用户姓名和电话
+ if(StringUtils.isNotEmpty(refundPassListVo.getUserName()) || StringUtils.isNotEmpty(refundPassListVo.getPhone())){
+ List<AppUser> data = appUserClient.getAppUserByName(refundPassListVo.getUserName()).getData();
List<Long> collect = data.stream().map(AppUser::getId).collect(Collectors.toList());
+ if (collect.isEmpty()){
+ appUserIds.add(-1L);
+ }
appUserIds.addAll(collect);
+
+ List<AppUser> data2 = appUserClient.getAppUserByPhone(refundPassListVo.getPhone()).getData();
+ List<Long> collect2 = data2.stream().map(AppUser::getId).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(data)){
+ for (AppUser datum : data) {
+ for (AppUser appUser : data2) {
+ if (!datum.getId().equals(appUser.getId())){
+ collect2.remove(appUser.getId());
+ }
+ }
+ }
+ }
+ if (collect2.isEmpty()){
+ appUserIds.add(-1L);
+ }
+ appUserIds.addAll(collect2);
}
- //搜索条件，用户电话
- if(StringUtils.isNotEmpty(refundPassListVo.getPhone())){
- List<AppUser> data = appUserClient.getAppUserByPhone(refundPassListVo.getPhone()).getData();
- List<Long> collect = data.stream().map(AppUser::getId).collect(Collectors.toList());
- appUserIds.addAll(collect);
- }
+
PageInfo<OrderRefundPassList> pageInfo = new PageInfo(refundPassListVo.getPageCurr(), refundPassListVo.getPageSize());
List<OrderRefundPassList> orderRefundPassList = this.baseMapper.getOrderRefundPassList(pageInfo, refundPassListVo.getCode(), appUserIds, shopId, refundPassListVo.getRefundMethod(), refundPassListVo.getStatus());
for (OrderRefundPassList refundPassList : orderRefundPassList) {
@@ -199,6 +227,7 @@
return R.fail("操作失败");
}
refundPass.setStatus(2);
+ refundPass.setReceiveTime(LocalDateTime.now());
//仅退款的售后需要将支付金额原路返回，然后再扣减支付获得的积分
Order order = orderService.getById(refundPass.getOrderId());
order.setOrderStatus(6);
@@ -244,4 +273,41 @@
}
return refundPassInfo;
}
+
+
+ /**
+ * 定时查询快递信息
+ */
+ @Override
+ public void taskExpress() {
+ Set<Long> order_express = redisTemplate.opsForZSet().rangeByScore("order_refund_express", 0, LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));
+ if(order_express.size() > 0){
+ for (Long id : order_express) {
+ RefundPass refundPass = this.getById(id);
+ Order order = orderService.getById(refundPass.getOrderId());
+ if(refundPass.getPassStatus() != 5){
+ redisTemplate.opsForZSet().remove("order_refund_express", id);
+ continue;
+ }
+ String expressJson = refundPass.getCode();
+ if(StringUtils.isEmpty(expressJson)){
+ redisTemplate.opsForZSet().remove("order_refund_express", id);
+ continue;
+ }
+ //{"com":"jd","num":"JDV016336234367"}
+ JSONObject jsonObject1 = JSON.parseObject(refundPass.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));
+ this.updateById(refundPass);
+ //延长时间x小时
+ SystemConfig systemConfig = systemConfigClient.getSystemConfig(3).getData();
+ JSONObject jsonObject2 = JSON.parseObject(systemConfig.getContent());
+ Integer waitTime = jsonObject2.getInteger("waitTime");
+ redisTemplate.opsForZSet().add("order_refund_express", refundPass.getId(), LocalDateTime.now().plusHours(waitTime).toEpochSecond(ZoneOffset.UTC));
+ }
+ }
+ }
}
--
Gitblit v1.7.1