From e097b03e9032a8e884c36e6a28d8b5002780daeb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 二月 2025 17:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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..85f9b40 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
@@ -160,7 +160,7 @@
@Override
- public void saveOrderOne(OrderDTO OrderDTO) {
+ public Long saveOrderOne(OrderDTO OrderDTO) {
Order order=new Order();
if (OrderDTO.getOrderFrom().getCode()==1){
order.setOrderFrom(OrderFromEnum.COMMODITY_ORDER);
@@ -234,7 +234,7 @@
}
-
+ return order.getId();
}
/**
@@ -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