From 34519422f35d642179631b8a9c60f5d93d1732e3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 28 八月 2024 18:05:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java
index 4edd63f..4962ff1 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java
@@ -267,7 +267,7 @@
 			shoppingOrder.setCouponId(exchangeDto.getGoodId());
 		}
 		shoppingOrder.setPurchaseQuantity(exchangeDto.getNum());
-		shoppingOrder.setAppUserAddressId(Long.valueOf(exchangeDto.getAddressId()));
+		shoppingOrder.setAppUserAddressId(exchangeDto.getAddressId());
 		shoppingOrder.setOrderAmount(exchangeDto.getOrderPrice());
 		if (exchangeDto.getCouponId()!=null) {
 			shoppingOrder.setAppCouponId(exchangeDto.getCouponId());

--
Gitblit v1.7.1