商城订单区分商品类型

src/main/java/com/mmc/oms/service/mall/impl/AppMallOrderServiceImpl.java

@@ -1214,7 +1214,7 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
         //产品sku信息
         List<OrderGoodsProdDTO> orderGoodsProdDTOList = new ArrayList<>();
         //处理产品商品
-        if(!CollectionUtils.isEmpty(param.getMallSpecIds()) && param.getDirectoryId().equals(1)){
+        if(!CollectionUtils.isEmpty(param.getMallSpecIds()) && !param.getDirectoryId().equals(2)){
             confirmGoodsInfoDTO.setDirectoryId(1);
             //设置查询商品信息的参数，mallProdSkuInfoSpecId
             mallOrderGoodsInfoQO.setMallProdSkuSpecIds(new HashSet<>());
@@ -1285,7 +1285,7 @@ public class AppMallOrderServiceImpl implements AppMallOrderService {
         BigDecimal couponDiscount = BigDecimal.ZERO;
 
         //处理产品商品
-        if(!CollectionUtils.isEmpty(param.getMallSpecIds())){
+        if(!CollectionUtils.isEmpty(param.getMallSpecIds()) && !param.getDirectoryId().equals(2)){
             //设置查询商品信息的参数，mallProdSkuInfoSpecId
             mallOrderGoodsInfoQO.setMallProdSkuSpecIds(new HashSet<>());
             mallOrderGoodsInfoQO.getMallProdSkuSpecIds().addAll(param.getMallSpecIds());