From 8c9ad0bd2fc6591fe606c793d6e11e2cfbe5a165 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 28 八月 2024 16:23:42 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
index e894029..d5fc9bb 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
@@ -186,7 +186,7 @@
name = goods.getName();
imgUrl = goods.getCoverPicture();
}else{
- TCoupon coupon = couponClient.getCouponById1(tShoppingOrder.getGoodsId()).getData();
+ TCoupon coupon = couponClient.getCouponById1(tShoppingOrder.getCouponId()).getData();
name = coupon.getName();
imgUrl = coupon.getCoverPicture();
}
@@ -227,7 +227,7 @@
name = goods.getName();
imgUrl = goods.getCoverPicture();
}else{
- TCoupon coupon = couponClient.getCouponById1(shoppingOrder.getGoodsId()).getData();
+ TCoupon coupon = couponClient.getCouponById1(shoppingOrder.getCouponId()).getData();
info.setCouponType(coupon.getType());
info.setDays(coupon.getDays());
info.setEndTime(coupon.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -243,8 +243,12 @@
info.setCreateTime(shoppingOrder.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
info.setPaymentAmount(shoppingOrder.getPaymentAmount());
info.setRemark(shoppingOrder.getRemark());
- info.setDeliveryTime(shoppingOrder.getConsignerTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- info.setFinishTime(shoppingOrder.getReceivingTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ if(null != shoppingOrder.getConsignerTime()){
+ info.setDeliveryTime(shoppingOrder.getConsignerTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ }
+ if(null != shoppingOrder.getReceivingTime()){
+ info.setFinishTime(shoppingOrder.getReceivingTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ }
return info;
}
--
Gitblit v1.7.1