From 1cc7486b0add774353b33f19c40a9ef1aa9b030c Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Mon, 28 Nov 2022 10:52:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=89=B9=E5=8F=91?=
 =?UTF-8?q?=E5=95=86=E5=93=81=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E6=97=B6=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=EF=BC=8C=E4=B8=8D=E5=9C=A8=E9=BB=98=E8=AE=A4=E4=B8=BA?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E4=B8=AA=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/src/main/java/cn/lili/common/enums/ResultCode.java  | 1 +
 .../lili/modules/goods/serviceimpl/WholesaleServiceImpl.java  | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
index 4250f857..f1ad52d4 100644
--- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java
+++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
@@ -81,6 +81,7 @@ public enum ResultCode {
 
     HAVE_INVALID_SALES_MODEL(11023, "批发规则存在小于等于0的无效数据！"),
     MUST_HAVE_GOODS_SKU_VALUE(11024, "规格值不能为空！"),
+    DO_NOT_MATCH_WHOLESALE(11025, "没有匹配的批发规则！"),
 
     GOODS_PARAMS_ERROR(11013, "商品参数错误，刷新后重试"),
     PHYSICAL_GOODS_NEED_TEMP(11014, "实物商品需选择配送模板"),
diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/WholesaleServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/WholesaleServiceImpl.java
index 1fbc89bd..d95edebf 100644
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/WholesaleServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/WholesaleServiceImpl.java
@@ -2,6 +2,8 @@ package cn.lili.modules.goods.serviceimpl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.lili.cache.Cache;
+import cn.lili.common.enums.ResultCode;
+import cn.lili.common.exception.ServiceException;
 import cn.lili.modules.goods.entity.dos.Wholesale;
 import cn.lili.modules.goods.mapper.WholesaleMapper;
 import cn.lili.modules.goods.service.WholesaleService;
@@ -75,7 +77,7 @@ public class WholesaleServiceImpl extends ServiceImpl<WholesaleMapper, Wholesale
         if (CollUtil.isNotEmpty(matchList)) {
             return matchList.get(matchList.size() - 1);
         } else if (CollUtil.isNotEmpty(wholesaleList) && CollUtil.isEmpty(matchList)) {
-            return wholesaleList.get(0);
+            throw new ServiceException(ResultCode.DO_NOT_MATCH_WHOLESALE);
         }
         return null;
     }