|
@@ -238,6 +238,7 @@ class merchantControl extends SystemControl
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
$update['company_name'] = trim($_POST['company_name']);
|
|
|
$update['org_pwd'] = trim($_POST['password']);
|
|
|
$update['password'] = md5($update['org_pwd']);
|
|
@@ -265,6 +266,9 @@ class merchantControl extends SystemControl
|
|
|
$update['time_out'] = intval($_POST['night_timeout']);
|
|
|
}
|
|
|
|
|
|
+ $query_add_times = intval($_POST['query_add_times'] ?? 0);
|
|
|
+ $query_reduce_amount = ncPriceFormat($_POST['query_reduce_amount'] ?? 0);
|
|
|
+
|
|
|
$member_id = $merchant['admin_id'];
|
|
|
$model_merchant = Model('merchant');
|
|
|
$trans = new trans_wapper($model_merchant, __METHOD__);
|
|
@@ -280,6 +284,7 @@ class merchantControl extends SystemControl
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
$result = $model_merchant->editMerchant($update, ['mchid' => $mchid]);
|
|
|
if (!$result) {
|
|
|
$trans->rollback();
|