From 9465eba6872fa401a0faa65891c8b6444479c3a5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 九月 2024 11:22:40 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 40fb7c6..6c6629d 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);
@@ -283,19 +283,21 @@
payPrice = orderPrice.subtract(coupon.getDiscountAmount());
discountPrice = coupon.getDiscountAmount();
}
- exchangeDto.setPayPrice(payPrice);
+ exchangeDto.setPayPrice(orderPrice);
exchangeDto.setDiscountPrice(discountPrice);
exchangeDto.setVipDiscount(vipDiscount);
+ exchangeDto.setUserId(userId);
//创建订单
TShoppingOrder shopOrder = orderClient.shopCreate(exchangeDto).getData();
if (exchangeDto.getPayMethod()==1) {
//调起支付
PaymentOrder paymentOrder = new PaymentOrder();
paymentOrder.setCode(shopOrder.getCode());
- paymentOrder.setAmount(shopOrder.getPaymentAmount());
+ paymentOrder.setAmount(exchangeDto.getOrderPrice());
paymentOrder.setOpenId(user.getWxOpenid());
paymentOrder.setDescription("购买商品");
- return wxPaymentClient.orderPay(paymentOrder);
+ R<Map<String, Object>> mapR = wxPaymentClient.orderPay(paymentOrder);
+ return mapR;
}else {
//todo 罗 支付宝支付
return R.ok();
--
Gitblit v1.7.1