refactor: 重构商品维度规则下单拦截

src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java

@@ -16,10 +16,12 @@ import com.qs.serve.modules.goods.entity.GoodsAccredit;
 import com.qs.serve.modules.goods.entity.GoodsCategoryRule;
 import com.qs.serve.modules.goods.entity.GoodsSku;
 import com.qs.serve.modules.goods.entity.GoodsSpu;
+import com.qs.serve.modules.goods.entity.dto.GoodsAccrIdsDto;
 import com.qs.serve.modules.goods.entity.dto.InventoryCusPrice;
 import com.qs.serve.modules.goods.entity.so.InventoryCusPriceQuery;
 import com.qs.serve.modules.goods.entity.vo.GoodSkuVo;
 import com.qs.serve.modules.goods.mapper.GoodsCategoryRuleMapper;
+import com.qs.serve.modules.goods.mapper.GoodsSkuMapper;
 import com.qs.serve.modules.goods.service.GoodsAccreditService;
 import com.qs.serve.modules.goods.service.GoodsRuleService;
 import com.qs.serve.modules.goods.service.GoodsSkuService;
@@ -66,6 +68,7 @@ import static com.qs.serve.modules.tbs.common.TbsSeeYonConst.*;
 @AllArgsConstructor
 public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> implements OmsOrderService {
 
+    private GoodsSkuMapper goodsSkuMapper;
     private GoodsSkuService goodsSkuService;
     private GoodsSpuService goodsSpuService;
     private GoodsCategoryRuleMapper goodsCategoryRuleMapper;
@@ -331,8 +334,22 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
 
         //拦截商品授权维度规则
         if(supplier!=null){
-            List<GoodsAccredit> accredits = goodsAccreditService.listIgnoreAcc(supplier.getId(),supplier.getSelectBizRegionIds(),supplier.getSelectSaleRegionIds());
+            GoodsAccrIdsDto accrIdsDto = goodsAccreditService.listIgnoreAcc2(supplier.getId(),supplier.getSelectBizRegionIds(),supplier.getSelectSaleRegionIds());
-            goodsAccreditService.checkSkuCode(spuIds,accredits,true);
+            List<Long> skuIds = goodsSkuMapper.listByOtherIds(
+                accrIdsDto.getCateIds(),
+                accrIdsDto.getSpuIds(),
+                accrIdsDto.getSkuIds(),
+                accrIdsDto.getNotInCateIds(),
+                accrIdsDto.getNotInSpuIds(),
+                accrIdsDto.getNotInSkuIds()
+            );
+            for (OmsOrderItem orderItem : newOrderItemList) {
+                for (Long skuId : skuIds) {
+                    if(orderItem.getSkuId().equals(skuId)){
+                        Assert.throwEx("商品未授权："+orderItem.getSkuCode());
+                    }
+                }
+            }
         }
 
         //拦截客户维度规则