hefei 1 year ago
parent
commit
1fd8a8b6c9

+ 8 - 5
app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -634,6 +634,14 @@ class OrderMerchantRepository extends BaseRepository
634 634
                     $this->feidacang_fenyong($user, $order_data, 0);
635 635
                 }
636 636
                 $this->feidacang_fenyong_mer($user, $order_data, 0);
637
+                // 增加商户分润
638
+                $mer_fanyongbili = merchantConfig($order['mer_id'], 'base_commission');
639
+                if ($mer_fanyongbili == 0) {
640
+                    $mer_fanyongbili = merchantConfig(0, 'extension_one_rate');
641
+                }
642
+                $commission = bcmul($order['pay_price'], bcdiv($mer_fanyongbili, '100', 2), 2);
643
+                $orderRepository = app()->make(StoreOrderRepository::class);
644
+                $orderRepository->con_log_fenrun($merchant['uid'],$commission,$order['order_id'],10,'扫码下单产生分润值',1);
637 645
                 $user = $userRepository->getOne($where);
638 646
                 $this->doBind($user, $order, $flag);//锁客
639 647
                 Db::name("log")->insert(['data' => '绑定用户完成']);//日志记录
@@ -1309,11 +1317,6 @@ class OrderMerchantRepository extends BaseRepository
1309 1317
         $divisible_commission = bcmul($order['pay_price'], bcdiv($mer_fanyongbili, '100', 2), 2);//让利部分
1310 1318
         $pv = bcmul($divisible_commission, '0.7', 2);//商家让利部分30%给消费者做养老金,70%做业绩PV
1311 1319
 
1312
-        // 增加商户分润
1313
-        $merchant = Db::name('merchant')->where('mer_id', $order['mer_id'])->find();
1314
-        $orderRepository = app()->make(StoreOrderRepository::class);
1315
-        $orderRepository->con_log_fenrun($merchant['uid'],$divisible_commission,$order['order_id'],10,'扫码下单产生分润值',1);
1316
-
1317 1320
         /**
1318 1321
          * 各自的比例开始
1319 1322
          */