seven před 6 dny
rodič
revize
34a9c6dbc3

+ 1 - 1
app/Models/PaymentOrder.php

@@ -17,7 +17,7 @@ class PaymentOrder extends Authenticatable
     use HasApiTokens, Notifiable;
     protected $table = 'payment_orders';
     // protected $hidden = ['created_at', 'updated_at'];
-    protected $fillable = ['type', 'order_no', 'member_id', 'amount' ,'channel' ,'bank_name' ,'account' ,'card_no' ,'status' ,'callback_url' ,'callback_data' ,'remark' ,'pay_no' ,'pay_url' ,'pay_data'];
+    protected $fillable = ['type', 'order_no', 'member_id', 'amount' ,'channel' ,'bank_name' ,'account' ,'card_no' ,'status' ,'callback_url' ,'callback_data' ,'remark' ,'pay_no' ,'pay_url' ,'pay_data' ,'fee'];
 
     protected function getCreatedAtAttribute($value)
     {

+ 2 - 2
app/Services/PaymentOrderService.php

@@ -201,7 +201,7 @@ class PaymentOrderService extends BaseService
         $data['member_id'] = $memberId;
         $data['amount'] = $amount;
         $data['channel'] = $channel;
-        $data['free'] = $amount * $rate;
+        $data['fee'] = $amount * $rate;
         $order_no = self::createOrderNo('sj'.$data['type'].'_', $memberId);
         $data['order_no'] = $order_no;
         $data['callback_url'] = SanJinService::getNotifyUrl();
@@ -270,7 +270,7 @@ class PaymentOrderService extends BaseService
             $order_no = self::createOrderNo('sj'.$data['type'].'_', $memberId);
             $data['order_no'] = $order_no;
             $data['member_id'] = $memberId;
-            $data['free'] = $amount * 0.002 + 2;
+            $data['fee'] = $amount * 0.002 + 2;
             $amount = number_format($amount, 2, '.', '');
             $data['amount'] = $amount;
             $data['channel'] = $channel;