Merge branch 'rbalance' of 39.97.239.116:gyfl/xyzshop into rbalance

admin/control/merchant.php

@@ -690,8 +690,8 @@ class merchantControl extends SystemControl
         $input['bank_name'] = $params['bank_name'] ?? '';
         $input['bz'] = $params['pointsdesc'];
         $input['voucher_name'] = $params['voucher_name'] ?? '/';
-        $input['status'] = 2;
-        $input['is_operation'] = 2;
+        $input['status'] = merchantModel::status_passed;
+        $input['is_operation'] =  merchantModel::oper_deposited;
         $input['add_time'] = $input['check_time'] = time();
         $input['after_available'] = ncPriceFormat($mem_info['available_predeposit'] + $params['pointsnum']);
         $input['admin_name'] = $admininfo['name'];