From e79036a6dd66482a4aa1b371054468a5ed5ee6b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= Date: Fri, 24 Oct 2025 18:30:14 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/adminapi/controller/RoomEmoji.php | 12 ++++++------ application/adminapi/controller/SysSet.php | 19 +++++++++++++------ .../cron/controller/PerformPerSecond.php | 6 +++--- extend/Yzh/YunPay.php | 7 ++++--- 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/application/adminapi/controller/RoomEmoji.php b/application/adminapi/controller/RoomEmoji.php index b4eaf73..c418da5 100644 --- a/application/adminapi/controller/RoomEmoji.php +++ b/application/adminapi/controller/RoomEmoji.php @@ -36,8 +36,8 @@ class RoomEmoji extends adminApi function emoji_list(){ $id = input('id', '', 'intval'); $name = input('name', '', 'trim'); - $page = input('page', 1, 'intval'); - $limit = input('limit', 10, 'intval'); + $page = input('page', 1); + $page_limit = input('page_limit', 30); $where = []; if ($id) { $where['id'] = $id; @@ -52,7 +52,7 @@ class RoomEmoji extends adminApi ->where($where) ->where(['deletetime' => 0]) ->order('sort desc,id desc') - ->page($page, $limit) + ->page($page, $page_limit) ->select(); foreach ($list as &$item) { $item['type_str'] = Db::name($this->table_type)->where('id', $item['type_id'])->value('type_name'); @@ -60,9 +60,9 @@ class RoomEmoji extends adminApi $item['status_str'] = $item['status'] == 1 ? '显示' : '隐藏'; } $return_data = [ - 'page' => $page, - 'limit' => $limit, - 'total' => $total, + 'page' =>$page, + 'page_limit' => $page_limit, + 'count' => $total, 'list' => $list ]; return V(1,"成功", $return_data); diff --git a/application/adminapi/controller/SysSet.php b/application/adminapi/controller/SysSet.php index 36702b1..c1d9437 100644 --- a/application/adminapi/controller/SysSet.php +++ b/application/adminapi/controller/SysSet.php @@ -35,6 +35,9 @@ class SysSet extends adminApi '10' => '邀请奖励', '11' => '二级密码', ]; + public $noAdminConfigType = [ + '1' => '基础设置', + ]; public function _initialize() { @@ -45,14 +48,18 @@ class SysSet extends adminApi * 类型列表 */ public function type_list(){ - $configType = $this->configType; + if($this->auth->isSuperAdmin()){ + $configType = $this->configType; + }else{ + $configType = $this->noAdminConfigType; + } $list = []; $i=0; - foreach ($configType as $k=>$v){ - $list[$i]['id'] = $k; - $list[$i]['name'] = $v; - $i++; - } + foreach ($configType as $k=>$v){ + $list[$i]['id'] = $k; + $list[$i]['name'] = $v; + $i++; + } return V(1,"成功", $list); } diff --git a/application/cron/controller/PerformPerSecond.php b/application/cron/controller/PerformPerSecond.php index 5569435..5c7b860 100644 --- a/application/cron/controller/PerformPerSecond.php +++ b/application/cron/controller/PerformPerSecond.php @@ -145,7 +145,7 @@ class PerformPerSecond continue; } } - if($value['yun_order_status'] == 5077){ + if(in_array($value['yun_order_status'],[261,5077])){ continue; } echo "提现订单查询：".$value['order_sn']."\n"; @@ -160,7 +160,7 @@ class PerformPerSecond 'updatetime' => time(), 'yun_order_status' => $result['data']['code'], // 'personal_tax_rate' => $result['personal_tax_rate'] ?? 0, - 'received_tax_amount' => $result['received_tax_amount'] ?? 0, + 'received_tax_amount' => $result['data']['received_tax_amount'] ?? 0, ]); }else{ db::name('vs_user_withdrawal')->where('order_sn',$value['order_sn'])->update([ @@ -170,7 +170,7 @@ class PerformPerSecond 'updatetime' => time(), 'yun_order_status' => $result['data']['code'], // 'personal_tax_rate' => $result['personal_tax_rate'] ?? 0, - 'received_tax_amount' => $result['received_tax_amount'] ?? 0, + 'received_tax_amount' => $result['data']['received_tax_amount'] ?? 0, ]); if(in_array($result['data']['code'],[5077,261]) && $value['yun_order_status'] == null){ // if($result['data']['code']==5077 && $value['yun_order_status'] == null){ diff --git a/extend/Yzh/YunPay.php b/extend/Yzh/YunPay.php index a7e12bf..9f10782 100644 --- a/extend/Yzh/YunPay.php +++ b/extend/Yzh/YunPay.php @@ -20,7 +20,7 @@ class YunPay public $id_card; public $card_no; public $order_amount; - public $notify_url = 'https://vespa.qxyushen.top/api/Payment/yun_callback'; + public $notify_url = 'https://md.xscmmidi.site/api/Payment/yun_callback'; public $phone = ''; public $config; @@ -205,6 +205,7 @@ class YunPay $request->setRequestID($request_id); $response = $this->paymentClient->getOrder($request); if ($response->isSuccess()) { + $tax_detail = $response->getData()->getTaxDetail();//获取税详情 // if(!empty($response->getData()->getTaxDetail())){ // $personal_tax_rate = $response->getData()->getTaxDetail()->getPersonalTaxRate(); // }else{ @@ -216,7 +217,7 @@ class YunPay 'code' => $response->getData()->getStatusDetail(), 'msg' => $response->getData()->getStatusMessage(), // 'personal_tax_rate' => $personal_tax_rate, - 'received_tax_amount' => $response->getData()->getReceivedTaxAmount() + 'received_tax_amount' => $tax_detail['user_received_personal_tax'] ?? 0 ]]; }else{ @@ -224,7 +225,7 @@ class YunPay 'code' => $response->getData()->getStatusDetail(), 'msg' => $response->getData()->getStatusDetailMessage(), // 'personal_tax_rate' => $personal_tax_rate, - 'received_tax_amount' => $response->getData()->getReceivedTaxAmount() + 'received_tax_amount' => $tax_detail['user_received_personal_tax'] ?? 0 ]]; }