xieruidong 2 years ago
parent
commit
71eaa3da64

+ 2 - 0
application/admin/controller/OrderInfoRefund.php

@@ -70,6 +70,8 @@ class OrderInfoRefund extends Backend
 
             return json($result);
         }
+        $this->assign('reason',Refund::getReasons());
+        $this->assign('refund_by',Refund::getRefundTypes());
         return $this->view->fetch();
     }
 

+ 1 - 1
application/api/controller/mall/OrderRefund.php

@@ -29,7 +29,7 @@ class OrderRefund extends Api
     {
         $info=[
             'reason'=>array_values(Refund::getReasons()),
-            'type'=>array_values(Refund::getGoodsTypes()),
+            'type'=>array_values(Refund::getRefundBys()),
         ];
         $this->success('', $info);
     }

+ 1 - 1
application/api/controller/mall/Orders.php

@@ -288,7 +288,7 @@ class Orders extends Api
             'num|数量'=>['require','integer','gt:0',"elt:{$orderInfo['num']}"],
             'amount|金额'=>['require','integer','gt:0',"elt:{$orderInfo['amount_pay']}"],
             'reason2|原因'=>['require','max:100'],
-            'refund_by|退货方式'=>['require','integer','gt:0','in:'.implode(',',array_keys(Refund::getGoodsTypes()))],
+            'refund_by|退货方式'=>['require','integer','gt:0','in:'.implode(',',array_keys(Refund::getRefundBys()))],
             'reason1|退款退货原因'=>['require','integer','gt:0','in:'.implode(',',array_keys(Refund::getReasons()))],
         ]);
         $newRefund=Refund::create([

+ 1 - 1
application/common/model/Refund.php

@@ -71,7 +71,7 @@ class Refund Extends Model
     /**
      * @return string[]
      */
-    public static function getGoodsTypes(): array
+    public static function getRefundBys(): array
     {
         $obj=self::$goodsTypes;
         $arr=[];