Merge remote-tracking branch 'origin/master'

luodangjia

2024-08-23 7085ba24d8decee4b13c86a55b93a3bcc4ea0d03

 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")));