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/TShoppingOrderServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 89ce5e6..75e28c4 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
@@ -461,7 +461,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();
}
@@ -484,6 +484,7 @@
TShoppingOrder shoppingOrder = this.baseMapper.selectOne(Wrappers.lambdaQuery(TShoppingOrder.class).eq(TShoppingOrder::getCode, code));
shoppingOrder.setPaymentStatus(2);
shoppingOrder.setSerialNumber(outTradeNo);
+ shoppingOrder.setPayTime(LocalDateTime.now());
this.updateById(shoppingOrder);
//如果是优惠券，赠送优惠券
if (shoppingOrder.getOrderType()==2){
--
Gitblit v1.7.1