商贸区，企业类型也允许支付

app/common/repositories/store/order/StoreOrderRepository.php

@@ -2457,7 +2457,7 @@ class StoreOrderRepository extends BaseRepository
                 $merchant = app()->make(MerchantRepository::class);
                 $tmpMerchantInfo = $merchant->get($store_product_datas['mer_id']);
                 // 1企业2个体3个人
-                if ($tmpMerchantInfo && in_array($tmpMerchantInfo['type'], [2, 3])) {
+                if ($tmpMerchantInfo && in_array($tmpMerchantInfo['type'], [1, 2, 3])) {
                     $jf = $orderpri - bcmul($store_product_datas['concession_pri'], 0.3, 2) . ' + ' . bcmul($store_product_datas['concession_pri'], 0.3, 2);
                     $jd = $orderpri - bcmul($store_product_datas['concession_pri'], 0.35, 2) . ' + ' . bcmul($store_product_datas['concession_pri'], 0.35, 2);
                     if ($store_product_datas['concession_pri'] != null || $store_product_datas['concession_pri'] != 0) {