From 3c99ce947f25a2dcbae14e78276df77978d412ca Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 26 九月 2024 16:03:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 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 243c47e..9a29276 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
@@ -90,12 +90,16 @@
String imgUrl = "";
if(tExchangeOrder.getOrderType() == 1){
TGoods goods = goodsClient.getGoodsById(tExchangeOrder.getGoodsId()).getData();
- name = goods.getName();
- imgUrl = goods.getCoverPicture();
+ if(null != goods){
+ name = goods.getName();
+ imgUrl = goods.getCoverPicture();
+ }
}else{
TCoupon coupon = couponClient.getCouponById1(tExchangeOrder.getCouponId()).getData();
- name = coupon.getName();
- imgUrl = coupon.getCoverPicture();
+ if(null != coupon){
+ name = coupon.getName();
+ imgUrl = coupon.getCoverPicture();
+ }
}
exchangeOrderList.setName(name);
exchangeOrderList.setImgUrl(imgUrl);
@@ -131,15 +135,19 @@
String imgUrl = "";
if(exchangeOrder.getOrderType() == 1){
TGoods goods = goodsClient.getGoodsById(exchangeOrder.getGoodsId()).getData();
- name = goods.getName();
- imgUrl = goods.getCoverPicture();
+ if(null != goods){
+ name = goods.getName();
+ imgUrl = goods.getCoverPicture();
+ }
}else{
TCoupon coupon = couponClient.getCouponById1(exchangeOrder.getCouponId()).getData();
- info.setCouponType(coupon.getType());
- info.setDays(coupon.getDays());
- info.setEndTime(coupon.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- name = coupon.getName();
- imgUrl = coupon.getCoverPicture();
+ if(null != coupon){
+ info.setCouponType(coupon.getType());
+ info.setDays(coupon.getDays());
+ info.setEndTime(coupon.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ name = coupon.getName();
+ imgUrl = coupon.getCoverPicture();
+ }
}
info.setName(name);
info.setImgUrl(imgUrl);
--
Gitblit v1.7.1