diff --git a/app/Models/Orders.php b/app/Models/Orders.php index 0769347..4c61d1f 100755 --- a/app/Models/Orders.php +++ b/app/Models/Orders.php @@ -219,12 +219,15 @@ class Orders extends SoftDeletesModel ->whereNotNull("paid_at") ->select("recharge.id", "recharge.order_id", "recharge.manager_id", "recharge.serial", "recharge.money", "recharge.payment", "recharge.payment_serial", "recharge.remark", "recharge.created_at") ->leftJoin("managers", "managers.id", "=", "recharge.manager_id") - ->addSelect("managers.name as manager_name"); + ->addSelect("managers.name as manager_name") + ->orderBy("id", "desc"); } public function refunds() { - return $this->hasMany(Refund::class, "order_id", "id")->whereNotNull("paid_at"); + return $this->hasMany(Refund::class, "order_id", "id") + ->whereNotNull("paid_at") + ->orderBy("id", "desc"); } public function getSerial() @@ -278,31 +281,6 @@ class Orders extends SoftDeletesModel return $this; } - public function determineNeedApprovePriceChange($new_price) - { - //todo:根据更多变化情形判断 - return $this->price != $new_price; - } - - public function getLastDayPriceOfNow() - { - $lastday_price_rules = $this->product->lastdayCheckoutRules; - $price = $this->price; - $now_rule = null; - foreach ($lastday_price_rules as $rule) { - if ($now_rule) { - continue; - } - if (time() < strtotime(date("Y-m-d") . " " . $rule->before_time)) { - $now_rule = $rule; - } - } - if ($now_rule) { - $price = $now_rule->percent / 100 * $price; - } - return $price; - } - public function requestFactorsToOrderFactors() { $request_factors = (array)json_decode(request()->factors, true);