From 6b6824e557512c921595cd0c62648c6d8d8e60bd Mon Sep 17 00:00:00 2001 From: wangxiaowei Date: Sun, 14 Jul 2024 12:43:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=89=88=E6=9C=AC=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/finance/WithdrawLogic.php | 77 ++++++++++--------- app/admin/logic/setting/BasicLogic.php | 4 + .../view/setting/basic/website_base.html | 19 +++++ app/api/logic/IndexLogic.php | 2 + 4 files changed, 66 insertions(+), 36 deletions(-) diff --git a/app/admin/logic/finance/WithdrawLogic.php b/app/admin/logic/finance/WithdrawLogic.php index 28266956..53d07289 100644 --- a/app/admin/logic/finance/WithdrawLogic.php +++ b/app/admin/logic/finance/WithdrawLogic.php @@ -76,7 +76,6 @@ class WithdrawLogic extends Logic // }else{ //// $where[] = ['w.create_time', 'between', Time::today()]; } - // 导出 if (true === $is_export) { return self::withdrawExport($where); @@ -85,16 +84,17 @@ class WithdrawLogic extends Logic $lists = WithdrawApply::alias('w') ->field('w.*, u.nickname,u.avatar, u.sn as user_sn, u.mobile, ul.name as user_level_name') - ->with('procurement') - ->leftJoin('procurement u', 'u.id = w.user_id') + ->with('user') + ->leftJoin('user u', 'u.id = w.user_id') ->leftJoin('user_level ul', 'ul.id = u.level') ->where($where) ->page($get['page'], $get['limit']) ->order('w.id desc') ->select(); + $count = WithdrawApply::alias('w') ->field('w.*, u.nickname,u.avatar, u.sn as user_sn, u.mobile, ul.name as user_level_name') - ->leftJoin('procurement u', 'u.id = w.user_id') + ->leftJoin('user u', 'u.id = w.user_id') ->leftJoin('user_level ul', 'ul.id = u.level') ->where($where) ->order('w.id desc') @@ -102,7 +102,7 @@ class WithdrawLogic extends Logic foreach ($lists as &$item) { - if (empty($item['procurement'])) { + if (empty($item['user'])) { // 用户不存在 $user = [ 'avatar' => '', @@ -110,7 +110,7 @@ class WithdrawLogic extends Logic 'nickname' => '-', ]; } else { - $user = $item['procurement']; + $user = $item['user']; } $item['type_text'] = WithdrawEnum::getTypeDesc($item['type']); $item['status_text'] = WithdrawEnum::getStatusDesc($item['status']); @@ -119,11 +119,11 @@ class WithdrawLogic extends Logic $item['user_level_name'] = $item['user_level_name'] ? $item['user_level_name'] : '无等级'; $user['user_level_name'] = $item['user_level_name']; // 通过中间变量$user解决Indirect modification of overloaded element报错 - $item['procurement'] = $user; + $item['user'] = $user; } return ['count' => $count, 'lists' => $lists]; } - + /** * @notes 会员佣金提现列表 * @param $get @@ -183,8 +183,8 @@ class WithdrawLogic extends Logic $lists = BalanceWithdrawApply::alias('w') ->field('w.*, u.nickname,u.avatar, u.sn as user_sn, u.mobile, ul.name as user_level_name') - ->with('procurement') - ->leftJoin('procurement u', 'u.id = w.user_id') + ->with('user') + ->leftJoin('user u', 'u.id = w.user_id') ->leftJoin('user_level ul', 'ul.id = u.level') ->where($where) ->page($get['page'], $get['limit']) @@ -192,7 +192,7 @@ class WithdrawLogic extends Logic ->select(); $count = BalanceWithdrawApply::alias('w') ->field('w.*, u.nickname,u.avatar, u.sn as user_sn, u.mobile, ul.name as user_level_name') - ->leftJoin('procurement u', 'u.id = w.user_id') + ->leftJoin('user u', 'u.id = w.user_id') ->leftJoin('user_level ul', 'ul.id = u.level') ->where($where) ->order('w.id desc') @@ -200,7 +200,7 @@ class WithdrawLogic extends Logic foreach ($lists as &$item) { - if (empty($item['procurement'])) { + if (empty($item['user'])) { // 用户不存在 $user = [ 'avatar' => '', @@ -208,7 +208,7 @@ class WithdrawLogic extends Logic 'nickname' => '-', ]; } else { - $user = $item['procurement']; + $user = $item['user']; } $item['type_text'] = WithdrawEnum::getTypeDesc($item['type']); $item['status_text'] = WithdrawEnum::getStatusDesc($item['status']); @@ -217,7 +217,7 @@ class WithdrawLogic extends Logic $item['user_level_name'] = $item['user_level_name'] ? $item['user_level_name'] : '无等级'; $user['user_level_name'] = $item['user_level_name']; // 通过中间变量$user解决Indirect modification of overloaded element报错 - $item['procurement'] = $user; + $item['user'] = $user; } return ['count' => $count, 'lists' => $lists]; } @@ -238,7 +238,7 @@ class WithdrawLogic extends Logic return ['successWithdraw' => $successWithdraw, 'handleWithdraw' => $handleWithdraw, 'totalEarnings' => $totalEarnings]; } - + /** * @notes 数据汇总 * @return array @@ -313,7 +313,7 @@ class WithdrawLogic extends Logic $lists = AccountLog::alias('a') ->field('a.*,u.nickname,u.sn as user_sn,u.mobile,w.sn as withdraw_sn') - ->join('procurement u', 'u.id = a.user_id') + ->join('user u', 'u.id = a.user_id') ->leftjoin('withdraw_apply w', 'w.sn = a.source_sn') ->where($where) ->page($get['page'], $get['limit']) @@ -322,7 +322,7 @@ class WithdrawLogic extends Logic $count = AccountLog::alias('a') ->field('a.*,u.nickname,u.sn as user_sn,u.mobile,w.sn as withdraw_sn') - ->join('procurement u', 'u.id = a.user_id') + ->join('user u', 'u.id = a.user_id') ->leftjoin('withdraw_apply w', 'w.sn = a.source_sn') ->where($where) ->order('a.id desc') @@ -423,7 +423,7 @@ class WithdrawLogic extends Logic $lists = AccountLog::alias('a') ->field('a.*,u.nickname,u.sn as user_sn,u.mobile') - ->join('procurement u', 'u.id = a.user_id') + ->join('user u', 'u.id = a.user_id') ->where($where) ->page($get['page'], $get['limit']) ->order('a.id desc') @@ -431,7 +431,7 @@ class WithdrawLogic extends Logic $count = AccountLog::alias('a') ->field('a.*,u.nickname,u.sn as user_sn,u.mobile') - ->join('procurement u', 'u.id = a.user_id') + ->join('user u', 'u.id = a.user_id') ->where($where) ->order('a.id desc') ->count(); @@ -506,7 +506,7 @@ class WithdrawLogic extends Logic $lists = RechargeOrder::alias('r') ->field('r.*,u.id,u.nickname,u.mobile') - ->join('procurement u', 'u.id = r.user_id') + ->join('user u', 'u.id = r.user_id') ->where($where) ->page($get['page'], $get['limit']) ->order('r.id desc') @@ -516,12 +516,12 @@ class WithdrawLogic extends Logic $list['pay_time'] = date('Y-m-d H:i:s', $list['pay_time']); } } - - //var_dump($lists); + + //var_dump($lists); $count = RechargeOrder::alias('r') ->field('r.*,u.id,u.nickname,u.mobile') - ->join('procurement u', 'u.id = r.user_id') + ->join('user u', 'u.id = r.user_id') ->where($where) ->order('r.id desc') ->count(); @@ -544,7 +544,7 @@ class WithdrawLogic extends Logic $detail = WithdrawApply::alias('w') ->field('w.*,u.sn as user_sn, u.nickname, u.mobile') - ->leftJoin('procurement u', 'u.id=w.user_id') + ->leftJoin('user u', 'u.id=w.user_id') ->where('w.id', $id) ->find(); $detail['typeDesc'] = WithdrawEnum::getTypeDesc($detail['type']); @@ -553,7 +553,7 @@ class WithdrawLogic extends Logic $detail['payment_time'] = $detail['payment_time'] ? date('Y-m-d H:i:s', $detail['payment_time']) : ''; return $detail; } - + /** * @notes 会员余额提现详情 * @param $id @@ -569,7 +569,7 @@ class WithdrawLogic extends Logic $detail = BalanceWithdrawApply::alias('w') ->field('w.*,u.sn as user_sn, u.nickname, u.mobile') - ->leftJoin('procurement u', 'u.id=w.user_id') + ->leftJoin('user u', 'u.id=w.user_id') ->where('w.id', $id) ->find(); $detail['typeDesc'] = WithdrawEnum::getTypeDesc($detail['type']); @@ -655,7 +655,7 @@ class WithdrawLogic extends Logic ]; } } - + /** * @notes 余额提现审核通过 * @param $post @@ -684,9 +684,9 @@ class WithdrawLogic extends Logic //提现到钱包余额 // if ($withdraw['type'] == WithdrawEnum::TYPE_BALANCE) { - // $procurement = User::find($withdraw['user_id']); - // $procurement->user_money = ['inc', $withdraw['left_money']]; - // $procurement->save(); + // $user = User::find($withdraw['user_id']); + // $user->user_money = ['inc', $withdraw['left_money']]; + // $user->save(); // AccountLogLogic::AccountRecord( // $withdraw['user_id'], // $withdraw['left_money'], @@ -725,6 +725,9 @@ class WithdrawLogic extends Logic if ($transfer_way == 2) { $result = WechatMerchantTransferLogic::transfer($withdraw); if(!isset($result['d'])){ + if($result['code'] == 0){ + return $result; + } BalanceWithdrawApply::where('id', $id) ->update(['status' => WithdrawEnum::STATUS_SUCCESS,'update_time' => time(), 'description' => $post['description']]); return $result; @@ -735,6 +738,8 @@ class WithdrawLogic extends Logic ]; } } + + } //提现到微信收款码、支付收款码 @@ -787,7 +792,7 @@ class WithdrawLogic extends Logic Db::rollback(); } } - + /** * @notes 余额提现审核拒绝 * @param $post @@ -1035,7 +1040,7 @@ class WithdrawLogic extends Logic try { $lists = RechargeOrder::alias('r') ->field('r.*,u.id,u.nickname,u.mobile') - ->join('procurement u', 'u.id = r.user_id') + ->join('user u', 'u.id = r.user_id') ->where($where) ->order('r.id desc') ->select()->toArray(); @@ -1084,7 +1089,7 @@ class WithdrawLogic extends Logic try { $lists = AccountLog::alias('a') ->field('a.*,u.nickname,u.sn as user_sn,u.mobile') - ->join('procurement u', 'u.id = a.user_id') + ->join('user u', 'u.id = a.user_id') ->where($where) ->order('a.id desc') ->select(); @@ -1125,7 +1130,7 @@ class WithdrawLogic extends Logic try { $lists = AccountLog::alias('a') ->field('a.*,u.nickname,u.sn as user_sn,u.mobile,w.sn as withdraw_sn') - ->join('procurement u', 'u.id = a.user_id') + ->join('user u', 'u.id = a.user_id') ->leftjoin('withdraw_apply w', 'w.sn = a.source_sn') ->where($where) ->order('a.id desc') @@ -1167,8 +1172,8 @@ class WithdrawLogic extends Logic try { $lists = WithdrawApply::alias('w') ->field('w.*, u.nickname,u.avatar, u.sn as user_sn, u.mobile, ul.name as user_level_name') - ->with('procurement') - ->leftJoin('procurement u', 'u.id = w.user_id') + ->with('user') + ->leftJoin('user u', 'u.id = w.user_id') ->leftJoin('user_level ul', 'ul.id = u.level') ->where($where) ->order('w.id desc') diff --git a/app/admin/logic/setting/BasicLogic.php b/app/admin/logic/setting/BasicLogic.php index b3a46711..856faf80 100644 --- a/app/admin/logic/setting/BasicLogic.php +++ b/app/admin/logic/setting/BasicLogic.php @@ -25,6 +25,8 @@ class BasicLogic extends Logic $config = [ 'file_url' => UrlServer::getFileUrl('/'), 'name' => ConfigServer::get('website', 'name'), + 'mini_notice' => ConfigServer::get('website', 'mini_notice'), + 'show_mini_notice' => ConfigServer::get('website', 'show_mini_notice'), 'web_favicon' => ConfigServer::get('website', 'web_favicon'), 'client_login_logo' => ConfigServer::get('website', 'client_login_logo'), 'pc_client_login_logo' => ConfigServer::get('website', 'pc_client_login_logo'), @@ -60,6 +62,8 @@ class BasicLogic extends Logic public static function setWebsiteBasic($post) { ConfigServer::set('website', 'name', $post['name']); + ConfigServer::set('website', 'mini_notice', $post['mini_notice']); + ConfigServer::set('website', 'show_mini_notice', $post['show_mini_notice']); ConfigServer::set('website', 'web_favicon', UrlServer::setFileUrl($post['web_favicon'] ?? '')); ConfigServer::set('website', 'client_login_logo', UrlServer::setFileUrl($post['client_login_logo'] ?? '')); ConfigServer::set('website', 'pc_client_login_logo', UrlServer::setFileUrl($post['pc_client_login_logo'] ?? '')); diff --git a/app/admin/view/setting/basic/website_base.html b/app/admin/view/setting/basic/website_base.html index b8b65d73..a008ccd8 100644 --- a/app/admin/view/setting/basic/website_base.html +++ b/app/admin/view/setting/basic/website_base.html @@ -12,6 +12,25 @@ + +
+ +
+
+
+ +
+
+ + +
+ +
小程序首页版本更新公告
+
+
+
+
diff --git a/app/api/logic/IndexLogic.php b/app/api/logic/IndexLogic.php index 99474214..538a5f1d 100644 --- a/app/api/logic/IndexLogic.php +++ b/app/api/logic/IndexLogic.php @@ -789,6 +789,8 @@ class IndexLogic extends Logic 'pc_login_logo' => UrlServer::getFileUrl(ConfigServer::get('website', 'pc_client_login_logo')), //pc登录封面 'web_favicon' => UrlServer::getFileUrl(ConfigServer::get('website', 'web_favicon')),//浏览器标签图标 'name' => ConfigServer::get('website', 'name'),//商城名称 + 'mini_notice' => ConfigServer::get('website', 'mini_notice'),//小程序公告 + 'show_mini_notice' => ConfigServer::get('website', 'show_mini_notice'),//显示小程序公告 'copyright_info' => ConfigServer::get('copyright', 'company_name'),//版权信息 'icp_number' => ConfigServer::get('copyright', 'number'),//ICP备案号 'icp_link' => ConfigServer::get('copyright', 'link'),//备案号链接