赠送京豆调整

app/controller/api/Notify.php

@@ -673,8 +673,8 @@ class Notify
                                     }
 
                                     //锁客收益
-                                    if ($store_order_data['mer_id'] > 0) {
-                                        $merchant_data = Db::name('merchant')->where('mer_id', $store_order_data['mer_id'])->find();
+                                    if ($user_data['mer_id'] != 0) {
+                                        $merchant_data = Db::name('merchant')->where('mer_id', $user_data['mer_id'])->find();
                                         $merchant_user_data = Db::name('user')->where('uid', $merchant_data['uid'])->find();
                                         if (!empty($merchant_user_data)) {
                                             //给推广者分配佣金
@@ -682,8 +682,12 @@ class Notify
                                             $fgj_amount_10 = bcmul($pv * 0.1, 0.05, 2);//推广者的佣金抽10%到个人复购金
                                             $this->fugou_user_log($merchant_data['uid'], $fgj_amount_10, $store_order_data['order_id'], 1);
                                             //推广佣金
-                                            $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);
+                                            $this->bill_user_log($merchant_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $group_order['group_order_sn'], '推广获得佣金' . $yj_amount_90, $user_data['mer_id'], 0);
                                         }
+                                    }
+
+                                    //京豆赠送
+                                    if ($store_order_data['mer_id'] > 0) {
                                         /** @var OrderMerchantRepository $orderMerchantRepository */
                                         $orderMerchantRepository = app()->make(OrderMerchantRepository::class);
                                         $jdAndGonxianConfig = $orderMerchantRepository->getMerchantContribution($store_product_attr_value['extension_one']);