一、open_basedir 不能再写 /tmp(7.4 池子把白名单收紧,Monolog/EasyWeChat 会抛异常)
- addons/shopro/library/Wechat.php:easywechat 日志改到 runtime/easywechat/
- addons/epay/library/Yansongda/Supports/Logger.php:epay 日志默认路径改到 runtime/epay/
- application/admin/library/traits/Backend.php:CSV 导入临时文件改到 runtime/temp/
二、implode 参数反序(7.4 起 E_DEPRECATED,TP5 会抛异常)
- application/api/controller/Datas.php
- application/index/controller/wms/Pda.php
- 另修正 Wms.php 中 1 处(拆分面单提示)
三、null 取下标(7.4 起 "Trying to access array offset on value of type null")
- 覆盖 71 个文件 135 行:find()/value()/json_decode()/redis get 等结果未判空即取下标处,
统一 (\['k'] ?? null) 兜底;foreach 目标用 ?? [];in_array/count 等数组参数用 ?? []
- 涉及 api/*、admin/shopro/*、addons/shopro/*、addons/epay/*、index/wms/* 等
四、嵌套三元未加括号(7.4 弃用)
- application/index/controller/wms/Wms.php getPackingprice 2 处,补括号后与旧版本解析顺序一致
验证:74 个文件、148 行改动,逐行括号/引号配平与 HEAD 一致,未改动 vendor/ 与 thinkphp/;
剩余扫描命中均为写目标、unset、或已被 if(!\){error()} 拦截的假阳性。
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
57 lines
2.2 KiB
PHP
57 lines
2.2 KiB
PHP
<?php
|
|
|
|
namespace addons\shopro\job;
|
|
|
|
use addons\shopro\library\traits\ActivityCache;
|
|
use addons\shopro\library\traits\Groupon;
|
|
use addons\shopro\model\Activity;
|
|
use addons\shopro\model\ActivityGroupon;
|
|
use think\queue\Job;
|
|
|
|
|
|
/**
|
|
* 订单自动操作
|
|
*/
|
|
class ActivityGrouponAutoOper extends BaseJob
|
|
{
|
|
use ActivityCache, Groupon;
|
|
|
|
/**
|
|
* 拼团判断,将团结束,
|
|
*/
|
|
public function expire(Job $job, $data){
|
|
try {
|
|
$activity = $data['activity'];
|
|
$activity_groupon_id = $data['activity_groupon_id'];
|
|
$activityGroupon = ActivityGroupon::where('id', $activity_groupon_id)->find();
|
|
|
|
// 活动正在进行中, 走这里的说明人数 都没满
|
|
if ($activityGroupon && ($activityGroupon['status'] ?? null)== 'ing') {
|
|
\think\Db::transaction(function () use ($activity, $activityGroupon) {
|
|
$rules = $activity['rules'];
|
|
// 是否虚拟成团
|
|
$is_fictitious = $rules['is_fictitious'] ?? 0;
|
|
// 最大虚拟人数 ,不填或者 "" 不限制人数,都允许虚拟成团, 0相当于不允许虚拟成团
|
|
$fictitious_num = (!isset($rules['fictitious_num']) || $rules['fictitious_num'] == '') ? 'no-limit' : $rules['fictitious_num'];
|
|
// 拼团剩余人数
|
|
$surplus_num = $activityGroupon['num'] - $activityGroupon['current_num'];
|
|
|
|
if ($is_fictitious && ($fictitious_num == 'no-limit' || $fictitious_num >= $surplus_num)) {
|
|
// 虚拟成团,如果虚拟用户不够,则自动解散
|
|
$this->finishFictitiousGroupon($activityGroupon);
|
|
} else {
|
|
// 解散退款
|
|
$this->invalidRefundGroupon($activityGroupon);
|
|
}
|
|
});
|
|
}
|
|
|
|
// 删除 job
|
|
$job->delete();
|
|
} catch (\Exception $e) {
|
|
// 队列执行失败
|
|
\think\Log::write('queue-' . get_class() . '-expire' . ':执行失败,错误信息:' . $e->getMessage());
|
|
}
|
|
}
|
|
|
|
} |