From 9549b5adbced80ee68acca2b0cb95fcec4e4809e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= Date: Sat, 4 Oct 2025 13:32:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=BA=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/adminapi/model/Guild.php | 2 +- application/api/controller/Payment.php | 13 +++++++++---- .../api/model/BlindBoxTurntableGiftDraw.php | 11 ++++++----- application/cron/controller/PerformPerSecond.php | 7 ++++--- extend/Yzh/YunPay.php | 14 +++++++------- 5 files changed, 27 insertions(+), 20 deletions(-) diff --git a/application/adminapi/model/Guild.php b/application/adminapi/model/Guild.php index 0c32e3c..6d74bd8 100644 --- a/application/adminapi/model/Guild.php +++ b/application/adminapi/model/Guild.php @@ -85,7 +85,7 @@ class Guild extends Model ->alias('g') ->join('vs_guild gg','g.guild_id = gg.id') ->field('gg.*') - ->where(['g.user_id' => $user_id]) + ->where(['g.user_id' => $user_id,'g.status' => 1,'g.delete_time' => 0]) ->find(); return $guild; } diff --git a/application/api/controller/Payment.php b/application/api/controller/Payment.php index 7b7a40c..b7b8984 100644 --- a/application/api/controller/Payment.php +++ b/application/api/controller/Payment.php @@ -225,10 +225,15 @@ class Payment extends Controller * 云账户回调(提现) */ public function yun_callback(){ - $data = input("data", ""); - $mess = input("mess", ""); - $timestamp = input("timestamp", ""); - $sign = input("sign", ""); +// $data = input("data", ""); +// $mess = input("mess", ""); +// $timestamp = input("timestamp", ""); +// $sign = input("sign", ""); + $data = $_POST['data']??""; + $mess = $_POST['mess']??""; + $timestamp = $_POST['timestamp']?? ""; + $sign = $_POST['sign']??""; + write_log_redis("yunzhanghu_huidiao_原始数据",$_POST); $yun_pay = new YunPay(); $result = $yun_pay->yun_callback($data,$mess,$timestamp,$sign); diff --git a/application/api/model/BlindBoxTurntableGiftDraw.php b/application/api/model/BlindBoxTurntableGiftDraw.php index 8070225..fc4be6e 100644 --- a/application/api/model/BlindBoxTurntableGiftDraw.php +++ b/application/api/model/BlindBoxTurntableGiftDraw.php @@ -79,7 +79,8 @@ class BlindBoxTurntableGiftDraw extends Model $num, $precomputedResults, $availableGiftss, - $gift_user_ids + $gift_user_ids, + $heart_id ); if ($transactionResult['code'] !== 1) { return $transactionResult; @@ -473,7 +474,7 @@ class BlindBoxTurntableGiftDraw extends Model /** * 执行抽奖事务（核心操作） */ - private function executeDrawTransaction($bag_data, $user_id, $room_id, $num, $precomputedResults,$availableGiftss,$gift_user_ids) + private function executeDrawTransaction($bag_data, $user_id, $room_id, $num, $precomputedResults,$availableGiftss,$gift_user_ids,$heart_id) { $gift_user_num = count(explode(',', $gift_user_ids)); //人数 $bagGiftPrice = $bag_data['gift_price'] * $num * $gift_user_num; @@ -504,7 +505,7 @@ class BlindBoxTurntableGiftDraw extends Model $this->deductUserCoins($user_id, $bagGiftPrice, $room_id); //发送礼物 - $result = $this->sendGiftsToRecipients($precomputedResults, $room_id,$user_id); + $result = $this->sendGiftsToRecipients($precomputedResults, $room_id,$user_id,$heart_id); if (isset($result['code']) && $result['code'] !== 1) { throw new \Exception($result['msg']); } @@ -684,7 +685,7 @@ class BlindBoxTurntableGiftDraw extends Model /** * 发送礼物给接收者 */ - private function sendGiftsToRecipients($precomputedResults, $room_id,$user_id) + private function sendGiftsToRecipients($precomputedResults, $room_id,$user_id,$heart_id) { // 统计每个用户每个礼物的数量 $giftUserCounts = []; @@ -722,7 +723,7 @@ class BlindBoxTurntableGiftDraw extends Model 1, $room_id, 0, - 0, + $heart_id, $giveGiftExt ); diff --git a/application/cron/controller/PerformPerSecond.php b/application/cron/controller/PerformPerSecond.php index 0a1f371..95de5c0 100644 --- a/application/cron/controller/PerformPerSecond.php +++ b/application/cron/controller/PerformPerSecond.php @@ -153,7 +153,7 @@ class PerformPerSecond 'pay_message' => $result['data']['msg'], 'updatetime' => time(), 'yun_order_status' => $result['data']['code'], - 'personal_tax_rate' => $result['personal_tax_rate'] ?? 0, +// 'personal_tax_rate' => $result['personal_tax_rate'] ?? 0, 'received_tax_amount' => $result['received_tax_amount'] ?? 0, ]); }else{ @@ -163,10 +163,11 @@ class PerformPerSecond 'pay_message' => $result['data']['msg'], 'updatetime' => time(), 'yun_order_status' => $result['data']['code'], - 'personal_tax_rate' => $result['personal_tax_rate'] ?? 0, +// 'personal_tax_rate' => $result['personal_tax_rate'] ?? 0, 'received_tax_amount' => $result['received_tax_amount'] ?? 0, ]); - if($result['data']['code']==5077 && $value['yun_order_status'] == null){ + if(in_array($result['data']['code'],[5077,261]) && $value['yun_order_status'] == null){ + // if($result['data']['code']==5077 && $value['yun_order_status'] == null){ //该支付宝账户不存在或未开通手机号转账功能。如有疑问，请收款用户联系支付宝客服咨询。 //退还金币 $res = model('api/UserWithdrawal')->withdrawal_fail($value['order_sn']); diff --git a/extend/Yzh/YunPay.php b/extend/Yzh/YunPay.php index 1dc8661..2110996 100644 --- a/extend/Yzh/YunPay.php +++ b/extend/Yzh/YunPay.php @@ -205,17 +205,17 @@ class YunPay $request->setRequestID($request_id); $response = $this->paymentClient->getOrder($request); if ($response->isSuccess()) { - if(!empty($response->getData()->getTaxDetail())){ - $personal_tax_rate = $response->getData()->getTaxDetail()->getPersonalTaxRate(); - }else{ - $personal_tax_rate = 0; - } +// if(!empty($response->getData()->getTaxDetail())){ +// $personal_tax_rate = $response->getData()->getTaxDetail()->getPersonalTaxRate(); +// }else{ +// $personal_tax_rate = 0; +// } // TODO 订单查询操作成功，根据订单状态 status 判断订单状态，做业务订单的处理 if($response->getData()->getStatusDetail() == 0){ return ['code' => 1, 'msg' => "订单状态：" . $response->getData()->getStatusMessage(), 'data' => [ 'code' => $response->getData()->getStatusDetail(), 'msg' => $response->getData()->getStatusMessage(), - 'personal_tax_rate' => $personal_tax_rate, +// 'personal_tax_rate' => $personal_tax_rate, 'received_tax_amount' => $response->getData()->getReceivedTaxAmount() ]]; @@ -223,7 +223,7 @@ class YunPay return ['code' => 1, 'msg' => "订单状态：" . $response->getData()->getStatusDetailMessage(), 'data' => [ 'code' => $response->getData()->getStatusDetail(), 'msg' => $response->getData()->getStatusDetailMessage(), - 'personal_tax_rate' => $personal_tax_rate, +// 'personal_tax_rate' => $personal_tax_rate, 'received_tax_amount' => $response->getData()->getReceivedTaxAmount() ]]; }