From 89c137a91583a19c78145067b513566548e1156f Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 31 May 2026 16:41:23 +0800 Subject: [PATCH] fix(mall): 修复独立分销固定佣金为空时报错 --- yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java | 5 +++-- yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java | 8 +++++--- yudao-module-mall/yudao-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java | 37 ++++++++++++++++++++++++++++++++++--- 3 files changed, 42 insertions(+), 8 deletions(-) diff --git a/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java b/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java index 0e2380a..3842bb4 100644 --- a/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java +++ b/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.trade.convert.order; import cn.hutool.core.util.BooleanUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -268,8 +269,8 @@ public interface TradeOrderConvert { .setTitle(StrUtil.format("{}成功购买{}", user.getNickname(), item.getSpuName())); if (BooleanUtil.isTrue(spu.getSubCommissionType())) { // 特殊:单独设置的佣金需要乘以购买数量。关联 https://gitee.com/yudaocode/yudao-mall-uniapp/issues/ICY7SJ - bo.setFirstFixedPrice(sku.getFirstBrokeragePrice() * item.getCount()) - .setSecondFixedPrice(sku.getSecondBrokeragePrice() * item.getCount()); + bo.setFirstFixedPrice(ObjectUtil.defaultIfNull(sku.getFirstBrokeragePrice(), 0) * item.getCount()) + .setSecondFixedPrice(ObjectUtil.defaultIfNull(sku.getSecondBrokeragePrice(), 0) * item.getCount()); } return bo; } diff --git a/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java b/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java index 4c3294c..845fea7 100644 --- a/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java +++ b/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java @@ -342,9 +342,11 @@ public class BrokerageRecordServiceImpl implements BrokerageRecordService { List skuList = productSkuApi.getSkuListBySpuId(ListUtil.of(spuId)); if (BooleanUtil.isTrue(spu.getSubCommissionType())) { // 3.2.1 商品独立分销模式:直接取 SKU 固定佣金 - // 注意:固定佣金允许为 0,表示商家主动设为零佣金 - Integer fixedMinPrice = getMinValue(skuList, ProductSkuRespDTO::getFirstBrokeragePrice); - Integer fixedMaxPrice = getMaxValue(skuList, ProductSkuRespDTO::getFirstBrokeragePrice); + // 注意:固定佣金允许为 0,表示商家主动设为零佣金;为空时,也按 0 处理 + Integer fixedMinPrice = getMinValue(skuList, + sku -> ObjectUtil.defaultIfNull(sku.getFirstBrokeragePrice(), 0)); + Integer fixedMaxPrice = getMaxValue(skuList, + sku -> ObjectUtil.defaultIfNull(sku.getFirstBrokeragePrice(), 0)); respVO.setBrokerageMinPrice(calculatePrice(null, tradeConfig.getBrokerageFirstPercent(), fixedMinPrice)) .setBrokerageMaxPrice(calculatePrice(null, tradeConfig.getBrokerageFirstPercent(), fixedMaxPrice)); } else { diff --git a/yudao-module-mall/yudao-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java b/yudao-module-mall/yudao-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java index 93a9daf..4cc69cd 100644 --- a/yudao-module-mall/yudao-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java +++ b/yudao-module-mall/yudao-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java @@ -202,7 +202,7 @@ public class BrokerageRecordServiceImplTest extends BaseDbUnitTest { } @Test - public void testCalculateProductBrokeragePrice_subCommissionEmptySkuList() { + public void testCalculateProductBrokeragePrice_subCommissionNullFixed() { // mock:分销功能已开启,比例 10%,当前用户有分销资格 TradeConfigDO tradeConfig = new TradeConfigDO(); tradeConfig.setBrokerageEnabled(true); @@ -210,15 +210,46 @@ public class BrokerageRecordServiceImplTest extends BaseDbUnitTest { when(tradeConfigService.getTradeConfig()).thenReturn(tradeConfig); when(brokerageUserService.getUserBrokerageEnabled(100L)).thenReturn(true); - // mock:商品开启独立分销,但查询不到 SKU 固定佣金 + // mock:商品开启独立分销,其中一个 SKU 固定佣金未配置 ProductSpuRespDTO spu = new ProductSpuRespDTO(); spu.setSubCommissionType(true); when(productSpuApi.getSpu(3L)).thenReturn(spu); - when(productSkuApi.getSkuListBySpuId(ListUtil.of(3L))).thenReturn(List.of()); + + ProductSkuRespDTO nullBrokerageSku = new ProductSkuRespDTO(); + nullBrokerageSku.setPrice(1000); + nullBrokerageSku.setFirstBrokeragePrice(null); + ProductSkuRespDTO fixedBrokerageSku = new ProductSkuRespDTO(); + fixedBrokerageSku.setPrice(2000); + fixedBrokerageSku.setFirstBrokeragePrice(200); + when(productSkuApi.getSkuListBySpuId(ListUtil.of(3L))).thenReturn(List.of(nullBrokerageSku, fixedBrokerageSku)); // 调用 AppBrokerageProductPriceRespVO result = brokerageRecordService.calculateProductBrokeragePrice(100L, 3L); + // 断言:独立分销固定佣金为空时按 0 处理,避免比较最小/最大佣金时报错 + assertTrue(result.getEnabled()); + assertEquals(0, result.getBrokerageMinPrice()); + assertEquals(200, result.getBrokerageMaxPrice()); + } + + @Test + public void testCalculateProductBrokeragePrice_subCommissionEmptySkuList() { + // mock:分销功能已开启,比例 10%,当前用户有分销资格 + TradeConfigDO tradeConfig = new TradeConfigDO(); + tradeConfig.setBrokerageEnabled(true); + tradeConfig.setBrokerageFirstPercent(10); + when(tradeConfigService.getTradeConfig()).thenReturn(tradeConfig); + when(brokerageUserService.getUserBrokerageEnabled(100L)).thenReturn(true); + + // mock:商品开启独立分销,但查询不到 SKU 固定佣金 + ProductSpuRespDTO spu = new ProductSpuRespDTO(); + spu.setSubCommissionType(true); + when(productSpuApi.getSpu(4L)).thenReturn(spu); + when(productSkuApi.getSkuListBySpuId(ListUtil.of(4L))).thenReturn(List.of()); + + // 调用 + AppBrokerageProductPriceRespVO result = brokerageRecordService.calculateProductBrokeragePrice(100L, 4L); + // 断言:独立分销没有固定佣金时,不回退到全局比例 assertTrue(result.getEnabled()); assertEquals(0, result.getBrokerageMinPrice()); -- libgit2 0.21.4