From f7042f313660010345f199d62afb6e3aeb8b5194 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 12 九月 2024 17:56:12 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 cddf7b0..97901b7 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
@@ -184,7 +184,8 @@
return R.ok();
}
- @ApiOperation(tags = {"小程序-兑换商城"},value = "积分兑换商品")
+ @ApiOperation(tags = {"小程序-" +
+ "兑换商城"},value = "积分兑换商品")
@PostMapping(value = "/app/shop")
public AjaxResult<PageInfo<TGoods>> shop(@RequestBody ExchangeDto exchangeDto) {
//检查当前用户积分是否够
@@ -269,6 +270,7 @@
if (exchangeDto.getGoodType()==1){
TGoods good = goodsService.getById(exchangeDto.getGoodId());
BigDecimal originalPrice = good.getPreferentialPrice();
+ exchangeDto.setTitle("【商品购买】"+good.getName());
if (isVip){
if (good.getVipPrice()!=null){
vipDiscount = originalPrice.subtract(good.getVipPrice()).multiply(BigDecimal.valueOf(exchangeDto.getNum()));
@@ -277,7 +279,9 @@
}
orderPrice = orderPrice.add(originalPrice.multiply(BigDecimal.valueOf(exchangeDto.getNum())));
}else {
+
TCoupon coupon = couponService.getById(exchangeDto.getGoodId());
+ exchangeDto.setTitle("【优惠卷购买】"+coupon.getName());
BigDecimal originalPrice = coupon.getPaymentAmount();
if (isVip){
if (coupon.getVipPaymentAmount()!=null) {
@@ -301,11 +305,14 @@
}
payPrice = orderPrice.subtract(coupon.getDiscountAmount());
discountPrice = coupon.getDiscountAmount();
+ }else {
+ payPrice = orderPrice;
}
- exchangeDto.setPayPrice(orderPrice);
+ exchangeDto.setPayPrice(payPrice);
exchangeDto.setDiscountPrice(discountPrice);
exchangeDto.setVipDiscount(vipDiscount);
exchangeDto.setUserId(userId);
+ exchangeDto.setPhone(user.getPhone());
//创建订单
TShoppingOrder shopOrder = orderClient.shopCreate(exchangeDto).getData();
if (exchangeDto.getPayMethod()==1) {
--
Gitblit v1.7.1