下单业务{extension_two}调整取值

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

@@ -744,7 +744,8 @@ class StoreOrderRepository extends BaseRepository
                     'commission_rate' => (float)$merchantRepository->get($cartInfo['mer_id'])->mer_commission_rate,
                     'order_type' => 0,
                     'extension_one' => round($total_extension_one, 2),
-                    'extension_two' => $total_extension_two,
+//                    'extension_two' => $total_extension_two,
+                    'extension_two' => $product_attr_unique_datas['extension_two'],//@todo 此字段已被用于分佣比例
                     'orderInfo' => $cartInfo['order'],
                     'cartInfo' => $cartInfo['list'],
                     'order_sn' => $this->getNewOrderId() . ($k + 1),
@@ -10202,20 +10203,25 @@ class StoreOrderRepository extends BaseRepository
                         //推广佣金
                         $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得拥金' . $yj_amount_90, $store_order_data['mer_id'], 0);
                     }
+                    /** @var OrderMerchantRepository $orderMerchantRepository */
+                    $orderMerchantRepository = app()->make(OrderMerchantRepository::class);
+                    $jdAndGonxianConfig = $orderMerchantRepository->getMerchantContribution($store_order_data['extension_two']);
+
                     //商户获得贡献值
                     if ($concession_pri >= 0.01) {
+                        $gonxian = round($concession_pri * $jdAndGonxianConfig['gonxian'],2);
                         $gongxian_data = [
                             "uid"           =>$merchant_data["uid"],
                             "mer_id"        =>$user_data['mer_id'],
                             "pv"            =>$pv,
-                            "number"  =>    $concession_pri,
+                            "number"  =>    $gonxian,
                             "addtime"       =>time(),
                             "status"        =>-1,
                             "order_type"    =>2,
                             "order_id"      =>$store_order_data['order_id'],
                             "mark"          =>"锁客商家获得贡献值",
                             "desc"          =>'',
-                            "surplus"       =>$concession_pri,
+                            "surplus"       =>$gonxian,
                             "type"          =>1
                         ];
                         Db::name("user_sign_gongxian")->insert($gongxian_data);//添加记录
@@ -10225,17 +10231,18 @@ class StoreOrderRepository extends BaseRepository
 
                     //商户获得京豆
                     if ($concession_pri >= 0.01) {
+                        $jd = round($concession_pri * $jdAndGonxianConfig['jd'],2);
                         $jd_data = [
                             "uid"           =>$merchant_data["uid"],
                             "mer_id"        =>$user_data['mer_id'],
-                            "number"  =>    $concession_pri,
+                            "number"  =>    $jd,
                             "addtime"       =>time(),
                             "status"        =>-1,
                             "order_type"    =>2,
                             "order_id"      =>$store_order_data['order_id'],
                             "mark"          =>"锁客商家获得京豆",
                             "desc"          =>'',
-                            "surplus"       =>$concession_pri,
+                            "surplus"       =>$jd,
                             "type"          =>1
                         ];
                         Db::name("user_sign_jingdou")->insert($jd_data);//添加记录