fix:下单规则校验修复

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

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){

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);