From 2e1753b61ab00e1df622ef9a706e0a8b8c85a15b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 14:18:05 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 8 ++++++--
1 files changed, 6 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 fc253ec..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) {
//检查当前用户积分是否够
@@ -304,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