From e23242d09e31e1c78f7ecdbc2859c9f99a3c4171 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期一, 17 三月 2025 10:00:59 +0800
Subject: [PATCH] 迭代版本：2.28
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 4025706..f0fa211 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -1,5 +1,8 @@
package com.ruoyi.order.service.impl;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -9,11 +12,13 @@
import com.ruoyi.common.core.constant.ExpressCompanyMap;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.HttpUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.uuid.QRCodeGenerator;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.enums.OrderStatus;
+import com.ruoyi.order.event.ConfirmDeliveryEvent;
import com.ruoyi.order.mapper.OrderGoodMapper;
import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.model.Order;
@@ -44,6 +49,7 @@
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.jetbrains.annotations.Nullable;
+import org.springframework.context.ApplicationEventPublisher;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -58,6 +64,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -137,6 +144,8 @@
private AppUserGiveawayTemporaryClient appUserGiveawayTemporaryClient;
@Resource
private ShopGiveawayTemporaryClient shopGiveawayTemporaryClient;
+ @Resource
+ private ApplicationEventPublisher applicationEventPublisher;
@Override
@@ -183,9 +192,9 @@
}
// 优惠券
String couponJson = order.getCouponJson();
- CouponInfo couponInfo = new CouponInfo();
+ JSONObject jsonObject = new JSONObject();
if (StringUtils.isNotEmpty(couponJson)) {
- couponInfo = JSONObject.parseObject(couponJson, CouponInfo.class);
+ jsonObject = JSONObject.parseObject(couponJson);
}
// 参与活动
@@ -208,7 +217,7 @@
orderDetailVO.setOrderNumber(order.getOrderNumber());
orderDetailVO.setCreateTime(order.getCreateTime());
orderDetailVO.setTotalAmount(order.getTotalAmount());
- orderDetailVO.setCouponName(couponInfo.getCouponName());
+ orderDetailVO.setCouponName(jsonObject.getString("couponName"));
orderDetailVO.setActivityName(orderActivityInfo.getActivityName());
orderDetailVO.setCouponAmount(order.getDiscountTotalAmount());
orderDetailVO.setExpressAmount(order.getExpressAmount());
@@ -246,6 +255,7 @@
}
return orderDetailVO;
}
+
@Override
public boolean check(Order order, Integer shopId, Long userId) {
@@ -1113,10 +1123,14 @@
userAddress.getProvince() + userAddress.getCity());
order.setExpressResult(JSON.toJSONString(mapTrackKD100Vo));
this.updateById(order);
+
+ // 发布事件
+ applicationEventPublisher.publishEvent(new ConfirmDeliveryEvent(order.getId()));
return R.ok();
}
+
public static void importExpress2(String filePath) throws MalformedURLException {
// 从网络地址读取
URL url = new URL(filePath);
--
Gitblit v1.7.1