修改变量

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

@@ -2365,9 +2365,9 @@ class StoreOrderRepository extends BaseRepository
                 // 商贸区
                 /** @var \app\common\repositories\merchant\MerchantRepository $merchant */
                 $merchant = app()->make(MerchantRepository::class);
-                $merchantInfo = $merchant->get($store_product_datas['mer_id']);
+                $tmpMerchantInfo = $merchant->get($store_product_datas['mer_id']);
                 // 1企业2个体3个人
-                if ($merchantInfo && in_array($merchantInfo['type'], [2, 3])) {
+                if ($tmpMerchantInfo && in_array($tmpMerchantInfo['type'], [2, 3])) {
                     $jf = $orderpri - round($store_product_datas['concession_pri'] * 0.3, 2) . ' + ' . round($store_product_datas['concession_pri'] * 0.3, 2);
                     $jd = $orderpri - round($store_product_datas['concession_pri'] * 0.35, 2) . ' + ' . round($store_product_datas['concession_pri'] * 0.35, 2);
                     if ($store_product_datas['concession_pri'] != null || $store_product_datas['concession_pri'] != 0) {