需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -722,9 +722,8 @@ public class PayOrderLogic {
                 .eq(!StringUtil.isEmpty(normType), WebsitGoods::getNormType, normType)
                 .eq(WebsitGoods::getGoodsType, "P")
                 .and(item -> item.like(!StringUtil.isEmpty(categoryId), WebsitGoods::getProductRelaName, categoryId)
-                        .and(item2 -> item2.like(!StringUtil.isEmpty(brand), WebsitGoods::getBrandRelaName, brand)
-                                .or().eq(!StringUtil.isEmpty(brand), WebsitGoods::getBrandRelaName, "通用")
-                        )
+                  //      .and(item2 -> item2.like(!StringUtil.isEmpty(brand), WebsitGoods::getBrandRelaName, brand)
+                        
                         .or().eq(WebsitGoods::getNormType, "S"))
 
                 .in(WebsitGoods::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId())