Merge remote-tracking branch 'origin/develop' into develop

application/admin/controller/OrderInfoRefund.php

@@ -124,7 +124,6 @@ class OrderInfoRefund extends Backend
             $this->error('无法退款');
         }
         if($refund->refund_type==$refund::REFUND_TYPE_ALL){
-            $refund->refund_status=$refund::REFUND_OVER;
             $refund->payToUser();
         }
         $refund->save();

application/common/model/Refund.php

@@ -294,6 +294,7 @@ class Refund Extends Model
     #end
     public function payToUser(){
         $payment = $this->orders->payment ?? null;
+        $this->refund_status=self::REFUND_OVER;
         if ($payment) {
             $this->order_no=order_no('tk');
             $this->save();