hefei пре 1 година
родитељ
комит
a052103d23
1 измењених фајлова са 5 додато и 8 уклоњено
  1. 5 8
      app/common/repositories/merchant/order/OrderMerchantRepository.php

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

@@ -634,14 +634,6 @@ 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);
645 637
                 $user = $userRepository->getOne($where);
646 638
                 $this->doBind($user, $order, $flag);//锁客
647 639
                 Db::name("log")->insert(['data' => '绑定用户完成']);//日志记录
@@ -1317,6 +1309,11 @@ class OrderMerchantRepository extends BaseRepository
1317 1309
         $divisible_commission = bcmul($order['pay_price'], bcdiv($mer_fanyongbili, '100', 2), 2);//让利部分
1318 1310
         $pv = bcmul($divisible_commission, '0.7', 2);//商家让利部分30%给消费者做养老金,70%做业绩PV
1319 1311
 
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
+
1320 1317
         /**
1321 1318
          * 各自的比例开始
1322 1319
          */