diff --git a/crmeb/app/Request.php b/crmeb/app/Request.php index 79427a47b..4dd20eca5 100644 --- a/crmeb/app/Request.php +++ b/crmeb/app/Request.php @@ -54,7 +54,7 @@ class Request extends \think\Request if (!isset($param[1])) $param[1] = null; if (!isset($param[2])) $param[2] = ''; if (is_array($param[0])) { - $name = is_array($param[1]) ? $param[0][0] . '/a' : (sys_config('param_filter_type') == 1 ? $param[0] : $param[0][0] . '/' . $param[0][1]); + $name = is_array($param[1]) ? $param[0][0] . '/a' : $param[0][0] . '/' . $param[0][1]; $keyName = $param[0][0]; } else { $name = is_array($param[1]) ? $param[0] . '/a' : $param[0]; diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemConfig.php b/crmeb/app/adminapi/controller/v1/setting/SystemConfig.php index 239a58861..c0394d99c 100644 --- a/crmeb/app/adminapi/controller/v1/setting/SystemConfig.php +++ b/crmeb/app/adminapi/controller/v1/setting/SystemConfig.php @@ -406,6 +406,9 @@ class SystemConfig extends AuthController return app('json')->fail('商品类型至少选择一项'); } } + if (isset($post['yue_pay_status']) && $post['yue_pay_status'] == 1) { + $post['balance_func_status'] = 1; + } if (isset($post['pay_weixin_client_cert'])) { $certData = [ 'type' => 'wechat', diff --git a/crmeb/app/dao/user/UserWechatUserDao.php b/crmeb/app/dao/user/UserWechatUserDao.php index dd8f70490..b98a83aa9 100644 --- a/crmeb/app/dao/user/UserWechatUserDao.php +++ b/crmeb/app/dao/user/UserWechatUserDao.php @@ -179,7 +179,7 @@ class UserWechatUserDao extends BaseDao $model = $model->whereBetween($userAlias . 'integral', $where['integral']); } elseif ($where['integral'][0] != '' && $where['integral'][1] == '') { $model = $model->where($userAlias . 'integral', '>', $where['integral'][0]); - } elseif ($where['integral'][0] == '' && $where['integral'][1] != ''){ + } elseif ($where['integral'][0] == '' && $where['integral'][1] != '') { $model = $model->where($userAlias . 'integral', '<', $where['integral'][1]); } }