解决商贸区，商家自营产品未按后台设置的分润比例扣除让利问题

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

@@ -7530,12 +7530,12 @@ class StoreOrderRepository extends BaseRepository
         //首先查询商品有没有设置佣金
 //        $extension = Db::name("store_product")->where("product_id", $order['product_id'])->field("mer_id,extension_type,type,commission")->find();
 
-        // 推荐创客收益设置
-        $shop_bonus_setting = merchantConfig($mer_id, 'shop_bonus_setting') ?: [
-            'shop_bonus_rate' => 30,
-            'yanglao_rate' => 5,
-        ];
-        Db::name('log')->insert(['data' => 'shop_bonus_setting:' . json_encode($shop_bonus_setting)]);
+        // // 推荐创客收益设置
+        // $shop_bonus_setting = merchantConfig($mer_id, 'shop_bonus_setting') ?: [
+        //     'shop_bonus_rate' => 30,
+        //     'yanglao_rate' => 5,
+        // ];
+        // Db::name('log')->insert(['data' => 'shop_bonus_setting:' . json_encode($shop_bonus_setting)]);
 
         //直推奖设置
         $zhitui_rate_setting = systemConfig('zhitui_rate');
@@ -7627,9 +7627,11 @@ class StoreOrderRepository extends BaseRepository
             //可分总佣金 暂时用不到 预留
             $divisible_commission = 0;
         } else {
-            //自营商品
-            //创客账户: 支付金额*（1-商户分润比例）-通道费+运费
-            $shop_bonus_rate = $shop_bonus_setting['shop_bonus_rate'] ?? 0;
+            //自营商品 和 商贸区
+            // //创客账户: 支付金额*（1-商户分润比例）-通道费+运费
+            // $shop_bonus_rate = $shop_bonus_setting['shop_bonus_rate'] ?? 0;
+            $shop_bonus_rate = merchantConfig($mer_id, 'base_commission') ?: 5;
+
             $mer_money = decimal2($pay_price * (1 - $shop_bonus_rate / 100) - $shouxufei + $total_postage);
 
             //平台金额：支付金额*商户分润比例-养老金