京豆赠送

app/controller/api/Notify.php

@@ -673,8 +673,8 @@ class Notify
                                     }
 
                                     //锁客收益
-                                    if ($user_data['mer_id'] != 0) {
-                                        $merchant_data = Db::name('merchant')->where('mer_id', $user_data['mer_id'])->find();
+                                    if ($store_order_data['mer_id'] > 0) {
+                                        $merchant_data = Db::name('merchant')->where('mer_id', $store_order_data['mer_id'])->find();
                                         $merchant_user_data = Db::name('user')->where('uid', $merchant_data['uid'])->find();
                                         if (!empty($merchant_user_data)) {
                                             //给推广者分配佣金
@@ -712,10 +712,10 @@ class Notify
 
                                         //商户获得京豆
                                         $jd = bcmul($concession_pri, $jdAndGonxianConfig['jd'], 2);
-                                        if ($concession_pri >= 0.01) {
+                                        if ($jd >= 0.01) {
                                             $jd_data = [
                                                 "uid" => $merchant_data["uid"],
-                                                "mer_id" => $user_data['mer_id'],
+                                                "mer_id" => $store_order_data['mer_id'],
                                                 "number" => $jd,
                                                 "addtime" => time(),
                                                 "status" => -1,