laowang 4 anni fa
parent
commit
6749c08e8c

+ 1 - 0
app/Http/Controllers/Admin/DepositCardController.php

@@ -160,6 +160,7 @@ class DepositCardController extends Controller
                 'pay_type' => DepositCardOrder::PAY_TYPE_ADMIN_GIVE,
                 'pay_status' => DepositCardOrder::PAY_STATUS_OK,
                 'pay_time' => Carbon::now(),
+                'merchant_id' => AdminMerchant::putMerchantId(),
             ]);
 
             $deposit_expire_time = Carbon::parse($users->deposit_expire_time);

+ 13 - 1
app/Models/DepositCardOrder.php

@@ -24,7 +24,19 @@ class DepositCardOrder extends Model
 {
     use ModelHelpers;
     protected $table = 'deposit_card_orders';
-
+    protected $fillable = [
+        'no',
+        'area_id',
+        'user_id',
+        'deposit_cards_id',
+        'money' ,
+        'effective_days',
+        'discount' ,
+        'pay_money',
+        'pay_type',
+        'pay_status',
+        'pay_time',
+        'merchant_id',];
 
     const NO_TAG = 'M';