From ac609951fb6d24339a69b3bb142d41f260b83262 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期三, 12 二月 2025 09:52:17 +0800
Subject: [PATCH] 1
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index a6c20d4..37aa8eb 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -493,6 +493,11 @@
memberOrderVO.setCoverPic(recommend.getGoodsImageUrl());
memberOrderVO.setSkuName(recommend.getGoodsName());
pice = recommend.getSellingPrice();
+ order.setSkuName(recommend.getGoodsName());
+ order.setPrice(recommend.getSellingPrice());
+ order.setCoverPic(recommend.getGoodsImageUrl());
+ order.setSjPrice(recommend.getSellingPrice());
+ order.setGoodsId(recommend.getId());
}
order.setOrderRemark(memberOrderDTO.getOrderRemark());
order.setMemberId(memberOrderDTO.getMemberId());
@@ -568,6 +573,7 @@
@Override
public MemberTiOrderVO updMemberOrder(MemberOrderDTO memberOrderDTO) {
+
Order order = baseMapper.selectById(memberOrderDTO.getId());
if(memberOrderDTO.getOrderRemark()!=null){
order.setOrderRemark(memberOrderDTO.getOrderRemark());
@@ -692,10 +698,10 @@
}
}
}
- if (memberOrderDTO.getOrderFrom() == OrderFromEnum.WISH_ORDER.getCode()) {
+ if (order.getOrderFrom() == OrderFromEnum.WISH_ORDER) {
// 远程调用营销服务，获取推荐商品信息
PromotionWishRecommend recommend = promotionClient.getPromotionWishRecommend(
- memberOrderDTO.getGoodsSkuId(),
+ order.getGoodsSkuId(),
SecurityConstants.INNER).getData();
if (Objects.isNull(recommend)) {
throw new ServiceException("推荐商品不存在");
@@ -721,7 +727,7 @@
order.setTotalAmount(recommend.getSellingPrice()
.multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity())));
order.setGoodsQuantity(memberOrderDTO.getGoodsQuantity());
- memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
+ memberOrderVO.setGoodsSkuId(order.getGoodsSkuId());
memberOrderVO.setPrice(recommend.getSellingPrice());
memberOrderVO.setCoverPic(recommend.getGoodsImageUrl());
memberOrderVO.setSkuName(recommend.getGoodsName());
@@ -1860,6 +1866,7 @@
LogisticsDTO logisticsDTO = new LogisticsDTO();
logisticsDTO.setCompany(order.getLogisticsNum());
logisticsDTO.setPostid(order.getCourierNumber());
+ logisticsDTO.setReceiverPhone(order.getReceiverPhone());
Express100VO logisticsList = logisticsService.getLogisticsList(logisticsDTO);
if (StringUtils.isNotNull(logisticsList)) {
mgtOrderVO.setExpress100VO(logisticsList);
--
Gitblit v1.7.1