diff --git a/app/Http/Controllers/ProfitsharingController.php b/app/Http/Controllers/ProfitsharingController.php index cde62b6..0bdeee9 100644 --- a/app/Http/Controllers/ProfitsharingController.php +++ b/app/Http/Controllers/ProfitsharingController.php @@ -78,7 +78,7 @@ class ProfitsharingController extends Controller return Yo::create_echo($p->id); } - public function eval_action($php, $in_value) + public function eval_action($php, $in_value, $surplus) { $out_value = 0; if ($php) { @@ -96,7 +96,7 @@ class ProfitsharingController extends Controller $php = $request->post('php'); $in_value = $request->post('in_value'); return Yo::echo([ - 'out_value' => self::eval_action($php, $in_value), + 'out_value' => self::eval_action($php, $in_value, 0), ]); } diff --git a/app/Http/Controllers/UserOrderController.php b/app/Http/Controllers/UserOrderController.php index 39b8ea9..7bd9c6d 100644 --- a/app/Http/Controllers/UserOrderController.php +++ b/app/Http/Controllers/UserOrderController.php @@ -52,7 +52,7 @@ class UserOrderController extends Controller $surplus = $price; foreach ($sharing as $item) { $formula = $item->formula; - $amount = number_format($p->eval_action($formula, $price), 2); + $amount = number_format($p->eval_action($formula, $price, $surplus), 2); $receivers[] = [ 'type' => $item->type == 1 ? 'MERCHANT_ID' : 'PERSONAL_OPENID', 'account' => $item->account,