From 9e2588deddbdcbd5171e95a3dde2fc058ed2727a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 28 八月 2024 16:12:36 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
index 6021c3a..d911e40 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
@@ -239,7 +239,7 @@
Long userId = tokenService.getLoginUserApplet().getUserId();
TAppUser user = appUserClient.getUserById(userId).getData();
boolean isVip = false;
- if (user.getVipEndTime().isAfter(LocalDateTime.now())){
+ if (user.getVipEndTime()!=null&&user.getVipEndTime().isAfter(LocalDateTime.now())){
isVip = true;
}
//计算价格
@@ -256,7 +256,7 @@
originalPrice = good.getVipPrice();
}
}
- orderPrice.add(originalPrice.multiply(BigDecimal.valueOf(exchangeDto.getNum())));
+ orderPrice = orderPrice.add(originalPrice.multiply(BigDecimal.valueOf(exchangeDto.getNum())));
}else {
TCoupon coupon = couponService.getById(exchangeDto.getGoodId());
BigDecimal originalPrice = coupon.getPaymentAmount();
@@ -266,7 +266,7 @@
originalPrice = coupon.getVipPaymentAmount();
}
}
- orderPrice.add(originalPrice);
+ orderPrice = orderPrice.add(originalPrice);
}
exchangeDto.setOrderPrice(orderPrice);
@@ -286,6 +286,7 @@
exchangeDto.setPayPrice(payPrice);
exchangeDto.setDiscountPrice(discountPrice);
exchangeDto.setVipDiscount(vipDiscount);
+ exchangeDto.setUserId(userId);
//创建订单
TShoppingOrder shopOrder = orderClient.shopCreate(exchangeDto).getData();
if (exchangeDto.getPayMethod()==1) {
--
Gitblit v1.7.1