From 190c75f4ac67b8c92c124f5e35488e35955d25f5 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 15 Sep 2024 20:27:46 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E5=95=86=E5=9F=8E=EF=BC=9A=E5=AE=8C=E5=96=84=E6=BB=A1?= =?UTF-8?q?=E5=87=8F=E9=80=81=E7=9A=84=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../promotion/service/reward/RewardActivityServiceImpl.java | 2 +- .../trade/controller/app/order/AppTradeOrderController.http | 5 +++++ .../module/trade/service/price/TradePriceServiceImpl.java | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImpl.java index 22da486097..c14cffb8ec 100755 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImpl.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImpl.java @@ -234,7 +234,7 @@ public class RewardActivityServiceImpl implements RewardActivityService { activityDTO.getRules().forEach(rule -> { String description = ""; if (PromotionConditionTypeEnum.PRICE.getType().equals(activityDTO.getConditionType())) { - description += StrUtil.format("满 {} 元", rule.getLimit()); + description += StrUtil.format("满 {} 元", MoneyUtils.fenToYuanStr(rule.getLimit())); } else { description += StrUtil.format("满 {} 件", rule.getLimit()); } diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.http b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.http index 4a94416942..59490a7736 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.http +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.http @@ -62,3 +62,8 @@ tenant-id: {{appTenentId}} GET {{appApi}}/trade/order/get-express-track-list?id=70 Authorization: Bearer {{appToken}} tenant-id: {{appTenentId}} + +### /trade-order/settlement-product 获得商品结算信息 +GET {{appApi}}/trade/order/settlement-product?spuIds=633 +Authorization: Bearer {{appToken}} +tenant-id: {{appTenentId}} \ No newline at end of file diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImpl.java index d0e4c0d85f..db61b0dd32 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImpl.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImpl.java @@ -125,7 +125,7 @@ public class TradePriceServiceImpl implements TradePriceService { TradePriceCalculateRespBO.OrderItem orderItem = new TradePriceCalculateRespBO.OrderItem() .setPayPrice(sku.getPrice()).setCount(1); // 计算限时折扣的优惠价格 - DiscountProductRespDTO discountProduct = skuIdAndDiscountMap.get(orderItem.getSkuId()); + DiscountProductRespDTO discountProduct = skuIdAndDiscountMap.get(sku.getId()); Integer discountPrice = discountActivityPriceCalculator.calculateActivityPrice(discountProduct, orderItem); // 计算 VIP 优惠金额 Integer vipPrice = discountActivityPriceCalculator.calculateVipPrice(level, orderItem);