MIDI/midi-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

国庆修改

Browse Source
This commit is contained in:
赵钊
2025-10-04 13:32:33 +08:00
parent 35953326c6
commit 9549b5adbc
5 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/adminapi/model/Guild.php
View File

@@ -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;
}

13
application/api/controller/Payment.php
View File

@@ -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);

11
application/api/model/BlindBoxTurntableGiftDraw.php
View File

@@ -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
);

7
application/cron/controller/PerformPerSecond.php
View File

@@ -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']);

14
extend/Yzh/YunPay.php
View File

@@ -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()
]];
}