From 6a9a7a8ec19e967ca521af5e6f0d8f4f59cc48a2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 10:05:08 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index 36745b4..e8fd731 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -412,6 +412,7 @@
 		confirmOrderVo.setResidualPoint(appUser.getLavePoint().intValue());
 		//获取默认收货地址
 		UserAddress userAddress = userAddressClient.getDefaultUserAddress(userid).getData();
+		userAddress.setIdStr(userAddress.getId().toString());
 		confirmOrderVo.setUserAddress(userAddress);
 		confirmOrderVo.setPaymentType(confirmOrder.getPaymentType());
 		//获取用户优惠券，用户全部优惠券，不能使用的需要标识出来置灰展示
@@ -1039,7 +1040,7 @@
 				this.removeBatchByIds(ids);
 			}
 		}
-		return R.ok();
+		return R.ok(order.getId().toString());
 	}
 	
 	

--
Gitblit v1.7.1