From 0f8b652bb1278fe6171be3a9aed552bc3f351b98 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Tue, 15 Oct 2024 08:35:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=8B=E5=8D=95=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/goods/service/GoodsRuleService.java      |  9 +++++++++
 .../goods/service/impl/GoodsRuleServiceImpl.java     | 12 +++++++++++-
 .../oms/service/impl/OmsOrderServiceImpl.java        |  3 +++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/qs/serve/modules/goods/service/GoodsRuleService.java b/src/main/java/com/qs/serve/modules/goods/service/GoodsRuleService.java
index 20275b2c..01cd3ffd 100644
--- a/src/main/java/com/qs/serve/modules/goods/service/GoodsRuleService.java
+++ b/src/main/java/com/qs/serve/modules/goods/service/GoodsRuleService.java
@@ -40,6 +40,15 @@ public interface GoodsRuleService extends IService<GoodsRule> {
      */
     boolean checkSkuCode(List<String> skuCodes,String supplierId,boolean throwEx);
 
+    /**
+     * 检测sku是否符合规则
+     * @param skuCodes
+     * @param userId
+     * @param throwEx
+     * @return
+     */
+    boolean checkSkuCodeByUserId(List<String> skuCodes,String userId,boolean throwEx);
+
     /**
      * 检测sku是否符合规则,返回不和规范的ID
      * @param supplierId
diff --git a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsRuleServiceImpl.java b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsRuleServiceImpl.java
index 5db60c53..50c734d6 100644
--- a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsRuleServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsRuleServiceImpl.java
@@ -377,6 +377,16 @@ public class GoodsRuleServiceImpl extends ServiceImpl<GoodsRuleMapper,GoodsRule>
     @Override
     public boolean checkSkuCode(List<String> skuCodes, String supplierId, boolean throwEx) {
         List<GoodsRuleItem> ruleItems = this.listBySupplierId(supplierId);
+        return baseCheckSkuCode(skuCodes, throwEx, ruleItems);
+    }
+
+    @Override
+    public boolean checkSkuCodeByUserId(List<String> skuCodes, String userId, boolean throwEx) {
+        List<GoodsRuleItem> ruleItems = this.listByUserId(userId);
+        return baseCheckSkuCode(skuCodes, throwEx, ruleItems);
+    }
+
+    private boolean baseCheckSkuCode(List<String> skuCodes, boolean throwEx, List<GoodsRuleItem> ruleItems) {
         if(CollUtil.isEmpty(skuCodes)){
             return false;
         }
@@ -384,7 +394,7 @@ public class GoodsRuleServiceImpl extends ServiceImpl<GoodsRuleMapper,GoodsRule>
         if(itemDTO==null){
             return true;
         }
-        List<GoodsSku> goodsSkuList = skuMapper.selectList(new LambdaQueryWrapper<GoodsSku>().in(GoodsSku::getSkuCode,skuCodes));
+        List<GoodsSku> goodsSkuList = skuMapper.selectList(new LambdaQueryWrapper<GoodsSku>().in(GoodsSku::getSkuCode, skuCodes));
         for (GoodsSku sku : goodsSkuList) {
             boolean notExistInOnly = false;
             if(itemDTO.getOnlySpuIds()!=null){
diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java
index 1d6e6c10..e7246eda 100644
--- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java
@@ -363,6 +363,9 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         //拦截客户维度规则
         goodsRuleService.checkSkuCode(skuCodes, supplier.getId(), true);
 
+        //用户维度拦截
+        goodsRuleService.checkSkuCodeByUserId(skuCodes,AuthContextUtils.getSysUserId(),true);
+
         //拦截品类下单规则
         this.handleCategoryRule(categoryRule, newOrderItemList);