From 428ebc05803402bd04ab3e9a6d770bb9eb9e2f65 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 17 八月 2024 16:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

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

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java
index ab3b9ba..7ae05e6 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java
@@ -82,7 +82,7 @@
 				name = goods.getName();
 				imgUrl = goods.getCoverPicture();
 			}else{
-				TCoupon coupon = couponClient.getCouponById(tExchangeOrder.getGoodsId()).getData();
+				TCoupon coupon = couponClient.getCouponById1(tExchangeOrder.getGoodsId()).getData();
 				name = coupon.getName();
 				imgUrl = coupon.getCoverPicture();
 			}
@@ -118,7 +118,7 @@
 			name = goods.getName();
 			imgUrl = goods.getCoverPicture();
 		}else{
-			TCoupon coupon = couponClient.getCouponById(exchangeOrder.getGoodsId()).getData();
+			TCoupon coupon = couponClient.getCouponById1(exchangeOrder.getGoodsId()).getData();
 			info.setCouponType(coupon.getType());
 			info.setDays(coupon.getDays());
 			info.setEndTime(coupon.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));

--
Gitblit v1.7.1