京豆问题

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

@@ -9941,8 +9941,8 @@ class StoreOrderRepository extends BaseRepository
 //                    }
 
                     //商户获得京豆
-                    if ($concession_pri >= 0.01) {
-                        $jd = bcmul($concession_pri, $jdAndGonxianConfig['jd'], 2);
+                    $jd = bcmul($concession_pri, $jdAndGonxianConfig['jd'], 2);
+                    if ($jd >= 0.01) {
                         $jd_data = [
                             "uid" => $merchant_data["uid"],
                             "mer_id" => $user_data['mer_id'],
@@ -9951,7 +9951,7 @@ class StoreOrderRepository extends BaseRepository
                             "status" => -1,
                             "order_type" => 2,
                             "order_id" => $store_order_data['order_id'],
-                            "mark" => "锁客商家获得京豆",
+                            "mark" => "线上用户消费商家获得京豆",
                             "desc" => '',
                             "surplus" => $jd,
                             "type" => 1

app/controller/api/Notify.php

@@ -711,8 +711,8 @@ class Notify
                     //                    }
 
                                         //商户获得京豆
+                                        $jd = bcmul($concession_pri, $jdAndGonxianConfig['jd'], 2);
                                         if ($concession_pri >= 0.01) {
-                                            $jd = bcmul($concession_pri, $jdAndGonxianConfig['jd'], 2);
                                             $jd_data = [
                                                 "uid" => $merchant_data["uid"],
                                                 "mer_id" => $user_data['mer_id'],