查询商家让利时，排除了企业类型商户，现在要加上

app/common/repositories/store/product/ProductRepository.php

@@ -1004,8 +1004,8 @@ class ProductRepository extends BaseRepository
         $res['yanglao']=($k['yanglao']);
         if($res['mer_id'] != 496){
             if($res['mer_id'] != 491){
-                $res['jfduihuan']=($k['jfduihuan']);
-                $res['jdduihuan']=($k['jdduihuan']);
+                $res['jfduihuan']=($k['jfduihuan']??0);
+                $res['jdduihuan']=($k['jdduihuan']??0);
             }
         }
 
@@ -1781,7 +1781,7 @@ class ProductRepository extends BaseRepository
                 $merchant = app()->make(MerchantRepository::class);
                 $merchantInfo = $merchant->get($product['mer_id']);
                 // 1企业2个体3个人
-                if ($merchantInfo && in_array($merchantInfo['type'],[2,3])) {
+                if ($merchantInfo && in_array($merchantInfo['type'],[1,2,3])) {
                     //商贸区
                     $jf = $product['price'] - bcmul($product['concession_pri'],0.3, 2) . ' + ' . bcmul($product['concession_pri'],0.3, 2);
                     $jd = $product['price'] - bcmul($product['concession_pri'],0.35, 2) . ' + ' . bcmul($product['concession_pri'],0.35, 2);