ZYT/zyt
2
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
Your Name
2026-05-13 16:54:54 +08:00
parent 1e8b5c4646
commit 0eaacbb4ce
9 changed files with 1373 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/app/adminapi/controller/stats/CommissionSettlementController.php
+12
View File
@@ -32,6 +32,8 @@ use app\adminapi\logic\stats\YejiStatsLogic;
* - POST stats.commissionSettlement/confirmFinalize
* - POST stats.commissionSettlement/confirmRevoke
* - GET stats.commissionSettlement/deptOptions
* - GET stats.commissionSettlement/channelOptions
@@ -106,6 +108,16 @@ class CommissionSettlementController extends BaseAdminController
public function confirmRevoke()
{
return $this->data(YejiStatsLogic::commissionSettlementConfirmRevoke($this->request->post(), $this->adminId, $this->adminInfo));
}
public function deptOptions()
{
server/app/adminapi/logic/stats/YejiStatsLogic.php
+581 -59
View File
@@ -5,12 +5,15 @@ declare(strict_types=1);
namespace app\adminapi\logic\stats;
use app\adminapi\logic\dept\DeptLogic;
use app\adminapi\logic\tcm\PrescriptionOrderLogic;
use app\common\model\auth\AdminDept;
use app\common\model\tcm\Diagnosis;
use app\common\model\tcm\PrescriptionOrder;
use app\common\service\DataScope\DataScopeService;
use app\common\service\ExpressTrackingService;
use app\common\service\qywx\MediaChannelService;
use think\db\Query;
use think\facade\Config;
use think\facade\Db;
/**
@@ -183,21 +186,95 @@ class YejiStatsLogic
}
}
$c['adminToPrimary'] = $filtered;
$allowedPrimaries = array_values(array_unique(array_values($filtered)));
if ($allowedPrimaries === []) {
$primariesFiltered = array_values(array_unique(array_filter(array_values($filtered), static fn (int $v): bool => $v > 0)));
if ($primariesFiltered === []) {
$c['tableRowDeptIds'] = [];
return;
}
$tableRowDeptIdsSrc = array_values(array_map('intval', $c['tableRowDeptIds'] ?? []));
$deptById = isset($c['deptById']) && \is_array($c['deptById']) ? $c['deptById'] : [];
$visibleAdminIds = array_map('intval', array_keys($filtered));
/** 与折叠业绩到表格行同源：SELF/本部门 等场景下台账锚点为父「中心」、表格仅有子行为时不能用 id 精确交集 */
$keepFlip = [];
if ($tableRowDeptIdsSrc !== [] && $deptById !== [] && $visibleAdminIds !== []) {
$mapped = self::batchMapPerformanceAdminsToTableDept($visibleAdminIds, $tableRowDeptIdsSrc, $deptById);
foreach ($mapped as $__tid) {
$t = (int) $__tid;
if ($t > 0) {
$keepFlip[$t] = true;
}
}
}
if ($keepFlip === [] && $tableRowDeptIdsSrc !== [] && $deptById !== []) {
foreach ($primariesFiltered as $p) {
foreach ($tableRowDeptIdsSrc as $tid) {
if ($tid <= 0) {
continue;
}
if (self::yejiDeptOnPathBetween($tid, $p, $deptById)) {
$keepFlip[$tid] = true;
}
}
}
}
if ($keepFlip === []) {
$c['tableRowDeptIds'] = [];
return;
}
$allowFlip = array_flip($allowedPrimaries);
$c['tableRowDeptIds'] = array_values(array_filter(
$c['tableRowDeptIds'],
static function (int $did) use ($allowFlip): bool {
return $did > 0 && isset($allowFlip[$did]);
$tableRowDeptIdsSrc,
static function (int $did) use ($keepFlip): bool {
return $did > 0 && isset($keepFlip[$did]);
}
));
}
/**
* 任一部门是否为另一部门的上级（ancestor 祖先、descendant 沿 pid 上移可遇到 ancestor）。
*/
private static function yejiDeptIsAncestorOfDept(int $ancestorId, int $descendantId, array $deptById): bool
{
if ($ancestorId <= 0 || $descendantId <= 0) {
return false;
}
$cur = $descendantId;
for ($i = 0; $i < 64; $i++) {
if ($cur === $ancestorId) {
return true;
}
if (!isset($deptById[$cur])) {
return false;
}
$cur = (int) ($deptById[$cur]['pid'] ?? 0);
if ($cur <= 0) {
return false;
}
}
return false;
}
/**
* 表格行 dept 与台账 primary 是否应对齐到同一 subtree（任一为另一祖先）。
*
* @param array<int, array<string, mixed>> $deptById
*/
private static function yejiDeptOnPathBetween(int $tableRowDeptId, int $ledgerPrimaryDeptId, array $deptById): bool
{
if ($tableRowDeptId <= 0 || $ledgerPrimaryDeptId <= 0) {
return false;
}
if ($tableRowDeptId === $ledgerPrimaryDeptId) {
return true;
}
return self::yejiDeptIsAncestorOfDept($tableRowDeptId, $ledgerPrimaryDeptId, $deptById)
|| self::yejiDeptIsAncestorOfDept($ledgerPrimaryDeptId, $tableRowDeptId, $deptById);
}
/**
* 与业绩看板相同的日期、部门树、渠道、标签与数据范围上下文，供医生日统计等复用。
*
@@ -5043,15 +5120,22 @@ class YejiStatsLogic
return null;
}
$r = is_array($row) ? $row : $row->toArray();
$st = (int) ($r['status'] ?? 0);
return [
'status' => (int) ($r['status'] ?? 0),
'status' => $st,
'reconcile_note' => (string) ($r['reconcile_note'] ?? ''),
'confirmed_admin_id' => (int) ($r['confirmed_admin_id'] ?? 0),
'confirmed_admin_name' => (string) ($r['confirmed_admin_name'] ?? ''),
'confirmed_at' => (int) ($r['confirmed_at'] ?? 0),
'confirmed_at_text' => !empty($r['confirmed_at']) ? date('Y-m-d H:i:s', (int) $r['confirmed_at']) : '',
'totals_json' => (string) ($r['totals_json'] ?? ''),
'revoked_at' => (int) ($r['revoked_at'] ?? 0),
'revoked_admin_id' => (int) ($r['revoked_admin_id'] ?? 0),
'revoked_admin_name' => (string) ($r['revoked_admin_name'] ?? ''),
'revoked_at_text' => !empty($r['revoked_at']) ? date('Y-m-d H:i:s', (int) $r['revoked_at']) : '',
// 仅 status=1 锁定，禁止重复确定；status=2 已撤回可再核对/确定
'is_confirmed_locked' => $st === 1,
];
}
@@ -5071,11 +5155,54 @@ class YejiStatsLogic
}
$prevMonthAnchor = strtotime('-1 month', $anchor);
$orderCreateStartTs = (int) strtotime(date('Y-m-01 00:00:00', $prevMonthAnchor));
$orderCreateEndTs = (int) strtotime(date('Y-m-t 23:59:59', $prevMonthAnchor));
if ($prevMonthAnchor === false) {
throw new \think\Exception('结算月日期无效');
}
$stRaw = trim((string) ($params['start_time'] ?? ''));
$etRaw = trim((string) ($params['end_time'] ?? ''));
$explicitOrderTimeWindow = ($stRaw !== '' && $etRaw !== '');
if ($explicitOrderTimeWindow) {
$t0 = strtotime($stRaw);
$t1 = strtotime($etRaw);
if ($t0 === false || $t1 === false) {
throw new \think\Exception('订单创建时间 start_time / end_time 无效，请与处方订单列表一致传入（如 2026-04-02 00:00:00）');
}
$orderCreateStartTs = (int) $t0;
$orderCreateEndTs = (int) $t1;
if ($orderCreateStartTs > $orderCreateEndTs) {
throw new \think\Exception('订单开始时间不能晚于结束时间');
}
$orderMonthLabel = date('Y-m-d H:i:s', $orderCreateStartTs) . ' ～ ' . date('Y-m-d H:i:s', $orderCreateEndTs);
} else {
$orderCreateStartTs = (int) strtotime(date('Y-m-01 00:00:00', $prevMonthAnchor));
$orderCreateEndTs = (int) strtotime(date('Y-m-t 23:59:59', $prevMonthAnchor));
$orderMonthLabel = date('Y-m', $prevMonthAnchor);
}
$cutoffTs = (int) strtotime(date('Y-m-07 23:59:59', $anchor));
$orderMonthLabel = date('Y-m', $prevMonthAnchor);
$fulfillmentStatus = (int) ($params['fulfillment_status'] ?? 3);
if ($fulfillmentStatus < 0) {
$fulfillmentStatus = 3;
}
if ($explicitOrderTimeWindow) {
if (array_key_exists('require_system_auto_prescription', $params)) {
$v = $params['require_system_auto_prescription'];
$requireSystemAutoEffective = $v === true || $v === 1 || $v === '1';
} else {
$requireSystemAutoEffective = false;
}
$applyListSqlVisibility = true;
$skipPhpDataScopeAttributionFilter = true;
} else {
$requireSystemAutoEffective = (bool) Config::get('project.commission_settlement.require_system_auto_prescription', true);
$applyListSqlVisibility = false;
$skipPhpDataScopeAttributionFilter = false;
}
$ctxParams = array_merge($params, [
'start_date' => date('Y-m-d', $orderCreateStartTs),
'end_date' => date('Y-m-d', $orderCreateEndTs),
@@ -5094,12 +5221,19 @@ class YejiStatsLogic
$rxTable = self::tableWithPrefix('tcm_prescription');
$att = self::sqlPerformanceAttributionAdminExpr();
$assistAttributionRestrictSelfId = 0;
if ($viewerAdminId > 0 && PrescriptionOrderLogic::statsRestrictedToOwnAssistantPerformanceDomain($viewerAdminInfo)) {
$assistAttributionRestrictSelfId = $viewerAdminId;
}
return [
'monthRaw' => $monthRaw,
'cutoffTs' => $cutoffTs,
'orderCreateStartTs' => $orderCreateStartTs,
'orderCreateEndTs' => $orderCreateEndTs,
'orderMonthLabel' => $orderMonthLabel,
'orderStartTimeText' => date('Y-m-d H:i:s', $orderCreateStartTs),
'orderEndTimeText' => date('Y-m-d H:i:s', $orderCreateEndTs),
'nextSettlementMonth' => self::commissionSettlementNextMonth($monthRaw),
'deptKey' => $deptKey,
'scopeChannelCode' => $scopeChannelCode,
@@ -5111,6 +5245,15 @@ class YejiStatsLogic
'diagTable' => $diagTable,
'rxTable' => $rxTable,
'att' => $att,
'assistAttributionRestrictSelfId' => $assistAttributionRestrictSelfId,
'fulfillmentStatus' => $fulfillmentStatus,
'explicitOrderTimeWindow' => $explicitOrderTimeWindow,
'requireSystemAutoEffective' => $requireSystemAutoEffective,
'applyListSqlVisibility' => $applyListSqlVisibility,
'skipPhpDataScopeAttributionFilter' => $skipPhpDataScopeAttributionFilter,
'viewerAdminId' => $viewerAdminId,
'viewerAdminInfo' => $viewerAdminInfo,
'commissionRequestParams' => $params,
];
}
@@ -5178,6 +5321,45 @@ class YejiStatsLogic
return $out;
}
/**
* 诊单关联挂号摘要展示：优先 status=3（已完成），否则取该诊单维度下最近一条挂号（patient_id=诊单 id）。
* doctor_appointment.patient_id 与诊单主键对齐，见 DiagnosisLists。
*
* @param int[] $diagnosisIds
*
* @return array<int, array{appointment_id: int, channels: int, appointment_date: string, appointment_status: int}> diagnosis_id => 摘要
*/
private static function commissionSettlementDiagnosisLatestCompletedAppointment(array $diagnosisIds): array
{
$ids = array_values(array_unique(array_filter(array_map('intval', $diagnosisIds), static fn (int $x): bool => $x > 0)));
if ($ids === []) {
return [];
}
$rows = Db::name('doctor_appointment')
->whereIn('patient_id', $ids)
->orderRaw('`patient_id` asc, (case when `status` = 3 then 1 else 0 end) desc, `id` desc')
->field(['id', 'patient_id', 'channels', 'appointment_date', 'status'])
->select()
->toArray();
$out = [];
foreach ($rows as $r) {
$dg = (int) ($r['patient_id'] ?? 0);
if ($dg <= 0 || isset($out[$dg])) {
continue;
}
$out[$dg] = [
'appointment_id' => (int) ($r['id'] ?? 0),
'channels' => (int) ($r['channels'] ?? 0),
'appointment_date' => trim((string) ($r['appointment_date'] ?? '')),
'appointment_status' => (int) ($r['status'] ?? 0),
];
}
return $out;
}
/**
* 挂号字典 channels：value(int) => name(string)。仅取本次涉及到的 value 集合，减少 dict 全量读取。
*
@@ -5230,16 +5412,91 @@ class YejiStatsLogic
}
/**
* 签收 / 尾款时间：对物流与支付关联做 GROUP BY 后 LEFT JOIN，避免 SELECT 中逐行相关子查询导致 overview 超时。
* 「本期提成 / 顺延下期」单笔判定（与 overview / orderLines / 确定结转一致）。
*
* @return array{eligible: bool, defer_code: string, defer_text: string}
*/
private static function commissionSettlementBucketEligible(int $signTs, int $payTs, int $cutoffTs): array
{
$deadlineText = date('Y-m-d H:i:s', $cutoffTs);
if ($signTs <= 0) {
return [
'eligible' => false,
'defer_code' => 'missing_sign',
'defer_text' => '库内无有效物流签收时间（轨迹未入库或运单号与物流主表不匹配）',
];
}
if ($payTs <= 0) {
return [
'eligible' => false,
'defer_code' => 'missing_pay',
'defer_text' => '无已支付关联单或未能解析尾款支付时间',
];
}
if ($signTs > $cutoffTs) {
return [
'eligible' => false,
'defer_code' => 'sign_after_cutoff',
'defer_text' => '物流签收晚于结算截止（' . $deadlineText . '）',
];
}
if ($payTs > $cutoffTs) {
return [
'eligible' => false,
'defer_code' => 'pay_after_cutoff',
'defer_text' => '尾款支付（' . date('Y-m-d H:i:s', $payTs) . '）晚于结算截止（' . $deadlineText . '），仅此一项也会导致顺延',
];
}
return ['eligible' => true, 'defer_code' => '', 'defer_text' => ''];
}
/**
* 签收 / 尾款时间：对物流与支付关联做 GROUP BY 后 LEFT JOIN。
* 签收时间不仅用 express_tracking.sign_time：历史数据或部分同步路径下 sign_time 仍为 0，
* 但 express_trace 已有「签收」语义轨迹（与 logisticsTrace 展示同源），此处用轨迹时间戳回填，避免误算为「无签收」而全部顺延。
*/
private static function commissionSettlementAttachExpressPayAggregates(Query $query): void
{
$etTable = self::tableWithPrefix('express_tracking');
$traceTable = self::tableWithPrefix('express_trace');
$linkTbl = self::tableWithPrefix('tcm_prescription_order_pay_order');
$payTbl = self::tableWithPrefix('order');
$etAggSql = "(SELECT et.order_id, MAX(et.sign_time) AS cs_sign_ts FROM {$etTable} et "
. "WHERE et.order_type = 'prescription' AND et.delete_time IS NULL GROUP BY et.order_id) cs_et_sig";
// 单条物流记录上的「有效签收时间戳」：sign_time > 0 优先；否则签收类轨迹；再否则主表已签收/已标记签收时用最新轨迹时间兜底
$sigTraceCond = "`tr_sig`.`status_code` IN ('3','301','302','304') OR `tr_sig`.`status` LIKE '%签收%' "
. "OR `tr_sig`.`trace_context` LIKE '%签收%' OR `tr_sig`.`trace_context` LIKE '%妥投%' "
. "OR `tr_sig`.`trace_context` LIKE '%已送达%' OR `tr_sig`.`trace_context` LIKE '%本人签收%'";
$rowSignExpr = 'GREATEST('
. 'IF(IFNULL(`et`.`sign_time`, 0) > 0, `et`.`sign_time`, 0), '
. 'IFNULL((SELECT MAX(`tr_sig`.`trace_time_stamp`) FROM `' . $traceTable . '` `tr_sig` '
. 'WHERE `tr_sig`.`tracking_id` = `et`.`id` AND IFNULL(`tr_sig`.`trace_time_stamp`, 0) > 0 AND ('
. $sigTraceCond
. ')), 0), '
. 'IF((`et`.`current_state` = \'3\' OR IFNULL(`et`.`is_signed`, 0) = 1), '
. 'IFNULL((SELECT MAX(`tr_any`.`trace_time_stamp`) FROM `' . $traceTable . '` `tr_any` '
. 'WHERE `tr_any`.`tracking_id` = `et`.`id` AND IFNULL(`tr_any`.`trace_time_stamp`, 0) > 0), 0), '
. '0)'
. ')';
$poTable = self::tableWithPrefix('tcm_prescription_order');
// tracking_number：TRIM 避免空格导致匹配失败；collation 统一避免 HY000 1267
$trackingJoinOn =
'TRIM(`po`.`tracking_number`) COLLATE utf8mb4_unicode_ci = TRIM(`et`.`tracking_number`) COLLATE utf8mb4_unicode_ci';
// 与 ExpressTrackingService::getDetailByTrackingNumber 一致：按单号可查即应能统计签收；勿再依赖 et.order_type（历史数据可能空串/未回写）。
// 口径一：express_tracking.order_id 指向处方业务单（用业务单表限定，而非 et.order_type 字符串）。
// 口径二：order_id 未绑定或漂移时，用处方单运单号与物流主表 TRIM 后等值关联。
$etAggSql = '(SELECT `u`.`order_id`, MAX(`u`.`cs_row_sign`) AS `cs_sign_ts` FROM ('
. 'SELECT `et`.`order_id` AS `order_id`, ' . $rowSignExpr . ' AS `cs_row_sign` FROM `' . $etTable . '` `et` '
. 'INNER JOIN `' . $poTable . '` `po_by_id` ON `po_by_id`.`id` = `et`.`order_id` AND `po_by_id`.`delete_time` IS NULL '
. 'WHERE `et`.`delete_time` IS NULL AND IFNULL(`et`.`order_id`, 0) > 0 '
. 'UNION ALL '
. 'SELECT `po`.`id` AS `order_id`, ' . $rowSignExpr . ' AS `cs_row_sign` FROM `' . $etTable . '` `et` '
. 'INNER JOIN `' . $poTable . '` `po` ON ' . $trackingJoinOn
. " AND LENGTH(TRIM(IFNULL(`po`.`tracking_number`, ''))) > 0 "
. ' AND `po`.`delete_time` IS NULL '
. 'WHERE `et`.`delete_time` IS NULL'
. ') AS `u` GROUP BY `u`.`order_id`) `cs_et_sig`';
$payAggSql = "(SELECT l.prescription_order_id AS cs_pay_oid, "
. 'MAX(CASE WHEN pay.order_type IN (5, 7) THEN UNIX_TIMESTAMP(pay.payment_time) END) AS cs_pay_tail_ts, '
@@ -5273,16 +5530,27 @@ class YejiStatsLogic
$rxTable = $pack['rxTable'];
$att = $pack['att'];
$requireSa = !empty($pack['requireSystemAutoEffective']);
$fulfillmentStatus = (int) ($pack['fulfillmentStatus'] ?? 3);
$rxJoinCond = 'rx.id = o.prescription_id AND rx.delete_time IS NULL';
if ($requireSa) {
$rxJoinCond .= ' AND IFNULL(rx.is_system_auto, 0) = 1';
}
$query = Db::name('tcm_prescription_order')
->alias('o')
->join("{$diagTable} dg", 'dg.id = o.diagnosis_id AND dg.delete_time IS NULL', 'INNER')
->join("{$rxTable} rx", 'rx.id = o.prescription_id AND rx.delete_time IS NULL AND IFNULL(rx.is_system_auto, 0) = 1', 'INNER');
->join("{$diagTable} dg", 'dg.id = o.diagnosis_id AND dg.delete_time IS NULL', 'INNER');
if ($requireSa) {
$query->join("{$rxTable} rx", $rxJoinCond, 'INNER');
} else {
$query->join("{$rxTable} rx", $rxJoinCond, 'LEFT');
}
self::commissionSettlementAttachExpressPayAggregates($query);
$query->whereNull('o.delete_time')
->where('o.fulfillment_status', 3)
->where('o.diagnosis_id', '>', 0)
->whereRaw("({$att}) > 0", []);
->where('o.fulfillment_status', $fulfillmentStatus)
->where('o.diagnosis_id', '>', 0);
$query->where(function ($qq) use ($pack) {
$qq->whereBetween('o.create_time', [$pack['orderCreateStartTs'], $pack['orderCreateEndTs']]);
@@ -5295,6 +5563,24 @@ class YejiStatsLogic
self::applyCommissionSettlementChannelFilter($query, $c);
$viewerAdminId = (int) ($pack['viewerAdminId'] ?? 0);
$viewerAdminInfo = $pack['viewerAdminInfo'] ?? [];
if (!empty($pack['applyListSqlVisibility']) && $viewerAdminId > 0 && \is_array($viewerAdminInfo)) {
$reqParams = $pack['commissionRequestParams'] ?? [];
PrescriptionOrderLogic::applyPrescriptionOrderListAccessForCommissionQuery(
$query,
'o',
$viewerAdminId,
$viewerAdminInfo,
\is_array($reqParams) ? $reqParams : []
);
}
$selfAid = (int) ($pack['assistAttributionRestrictSelfId'] ?? 0);
if ($selfAid > 0) {
$query->whereRaw("({$att}) = ?", [$selfAid]);
}
return $query;
}
@@ -5303,9 +5589,9 @@ class YejiStatsLogic
*
* 规则摘要：
* - 订单池：结算月上一自然月内创建；关联处方 is_system_auto=1（系统代开）；履约已完成 fulfillment_status=3；未软删。
* - 签收时间：express_tracking.order_type=prescription 下 MAX(sign_time)。
* - 签收时间：express_tracking 与处方单关联（order_id 命中业务单 **或** 运单号 TRIM 后一致）；sign_time / express_trace 轨迹回填，与 logisticsTrace(getDetailByTrackingNumber) 同源，不依赖 et.order_type 字符串（历史数据可能未写入）。
* - 尾款支付时间：关联支付单 status=2，优先 order_type∈(5,7)，否则回退为任意已支付关联单的 MAX(payment_time)。
* - 计入本期：签收与尾款时间均已成立且不晚于结算月 7 日 23:59:59。
* - 计入本期：签收与尾款时间均已成立，且**两者均**不晚于结算月 7 日 23:59:59（仅签收在截止前但尾款更晚→仍顺延）。
* - 其余已完成单计入「顺延下期」（含签收或支付缺失、或晚于截止）。
*
* @param array{settlement_month?: string, dept_ids?: int[]|string, channel_code?: string, tag_id?: string} $params
@@ -5326,6 +5612,9 @@ class YejiStatsLogic
$confirm = self::commissionSettlementGetConfirmRow($monthRaw, $pack['scopeChannelCode'], $pack['deptKey']);
$requireSysAutoPo = !empty($pack['requireSystemAutoEffective']);
$explicitOrderTimeWindow = !empty($pack['explicitOrderTimeWindow']);
$emptyTotal = [
'completed_order_count' => 0,
'completed_order_amount' => 0.0,
@@ -5337,22 +5626,30 @@ class YejiStatsLogic
];
if ($tableRowDeptIds === [] || $adminToPrimary === []) {
$ruleLegacy = '订单创建月为结算月上一个月的自然月整段；或未传 start/end 时为整月时间段。签收与尾款均在结算月 7 日前完成的计入本期，否则顺延。上期「确定业绩」产生的顺延订单会并入本期。';
$ruleAligned = '传 start_time+end_time 时订单池与处方订单列表一致（创建时间与 fulfillment_status）；默认含手动与系统处方，可见性与列表同源。结转与签收/尾款截止日期规则同上。';
return [
'settlement_month' => $monthRaw,
'order_month' => $orderMonthLabel,
'cutoff_end' => date('Y-m-d H:i:s', $cutoffTs),
'rule_note' => '订单创建月为结算月的上一自然月；统计系统代开处方对应的已完成业务订单；签收与尾款均在结算月 7 日 24 点前完成的金额计入本期提成，否则计入顺延下期。上期「确定业绩」写入的顺延订单会在本期并入统计。',
'channel_code' => $c['channelCode'],
'channel_name' => $c['channelInfo'] ? (string) $c['channelInfo']['channel_name'] : '',
'scope_dept_ids_key' => $pack['deptKey'],
'carry_in_order_count' => 0,
'confirm' => $confirm,
'rows' => [],
'assistant_rows' => [],
'doctor_rows' => [],
'assistant_channel_rows' => [],
'doctor_channel_rows' => [],
'total' => $emptyTotal,
'settlement_month' => $monthRaw,
'order_month' => $orderMonthLabel,
'order_start_time' => $pack['orderStartTimeText'],
'order_end_time' => $pack['orderEndTimeText'],
'fulfillment_status' => $pack['fulfillmentStatus'],
'explicit_order_time_window' => $explicitOrderTimeWindow,
'cutoff_end' => date('Y-m-d H:i:s', $cutoffTs),
'rule_note' => $explicitOrderTimeWindow ? $ruleAligned : $ruleLegacy,
'channel_code' => $c['channelCode'],
'channel_name' => $c['channelInfo'] ? (string) $c['channelInfo']['channel_name'] : '',
'scope_dept_ids_key' => $pack['deptKey'],
'carry_in_order_count' => 0,
'confirm' => $confirm,
'rows' => [],
'assistant_rows' => [],
'doctor_rows' => [],
'assistant_channel_rows' => [],
'doctor_channel_rows' => [],
'total' => $emptyTotal,
'require_system_auto_prescription' => $requireSysAutoPo,
];
}
@@ -5366,6 +5663,9 @@ class YejiStatsLogic
'o.diagnosis_id',
'o.create_time',
'o.amount',
'o.tracking_number',
'o.express_company',
'o.recipient_phone',
Db::raw("({$att}) AS assistant_id"),
Db::raw('IFNULL(rx.creator_id, 0) AS doctor_id'),
], $signPayFields))->select()->toArray();
@@ -5412,17 +5712,49 @@ class YejiStatsLogic
$doctorChDefCnt = [];
$doctorChCarry = [];
$assistScopeFlip = null;
if (!empty($c['dataScopeRestricted'])
&& isset($c['dataScopeVisibleAdminIds'])
&& $c['dataScopeVisibleAdminIds'] !== []) {
$assistScopeFlip = array_flip(array_map('intval', $c['dataScopeVisibleAdminIds']));
}
$selfOnlyAttributionAid = (int) ($pack['assistAttributionRestrictSelfId'] ?? 0);
if ($selfOnlyAttributionAid > 0) {
$assistScopeFlip = [$selfOnlyAttributionAid => true];
}
$skipPhpDs = !empty($pack['skipPhpDataScopeAttributionFilter']);
foreach ($rowsRaw as $r) {
$aid = (int) ($r['assistant_id'] ?? 0);
if (!$skipPhpDs && $assistScopeFlip !== null && ($aid <= 0 || !isset($assistScopeFlip[$aid]))) {
continue;
}
// 展示部门有勾选时：只统计可归入当前部门上下文（adminToPrimary）的医助，与部门汇总口径一致；否则「按医助下发」会混入部门外的业绩医助。
if (!empty($c['explicitDeptFilter']) && ($aid <= 0 || !isset($adminToPrimary[$aid]))) {
continue;
}
$oid = (int) ($r['id'] ?? 0);
$isCarry = $oid > 0 && isset($carryFlip[$oid]);
if ($isCarry) {
$carryInCnt++;
}
$aid = (int) ($r['assistant_id'] ?? 0);
$doctorId = (int) ($r['doctor_id'] ?? 0);
$signTs = (int) ($r['sign_ts'] ?? 0);
$payTs = (int) ($r['pay_ts'] ?? 0);
if ($signTs <= 0) {
$tn0 = trim((string) ($r['tracking_number'] ?? ''));
if ($tn0 !== '') {
$signTs = ExpressTrackingService::resolveSignUnixTimeForCommission(
$tn0,
(string) ($r['express_company'] ?? 'auto'),
(string) ($r['recipient_phone'] ?? ''),
true
);
}
}
$amt = round((float) ($r['amount'] ?? 0), 2);
$dgId = (int) ($r['diagnosis_id'] ?? 0);
$apCh = (int) ($diagToApptChannel[$dgId] ?? 0);
@@ -5434,7 +5766,7 @@ class YejiStatsLogic
$totAgg[$aid] = ($totAgg[$aid] ?? 0.0) + $amt;
$cntByAsst[$aid] = ($cntByAsst[$aid] ?? 0) + 1;
$eligible = $signTs > 0 && $payTs > 0 && $signTs <= $cutoffTs && $payTs <= $cutoffTs;
$eligible = self::commissionSettlementBucketEligible($signTs, $payTs, $cutoffTs)['eligible'];
if ($eligible) {
$curAgg[$aid] = ($curAgg[$aid] ?? 0.0) + $amt;
$curCntByAsst[$aid] = ($curCntByAsst[$aid] ?? 0) + 1;
@@ -5710,22 +6042,42 @@ class YejiStatsLogic
return ($b['completed_order_amount'] ?? 0) <=> ($a['completed_order_amount'] ?? 0);
});
if ($explicitOrderTimeWindow) {
$ruleNoteFull = '订单池与「处方订单列表」对齐：create_time 介于 start_time～end_time（与列表 between_time 同源），'
. ('fulfillment_status=' . (string) (int) ($pack['fulfillmentStatus'] ?? 3) . '。')
. ($requireSysAutoPo
? '当前已开启仅统计关联处方 is_system_auto=1（系统代开）的订单；与未限制开方类型的列表条数可能不一致。'
: '未限制仅系统代开处方（含手动），与列表在同一时段、同一状态下条数应一致（另受本页展示部门／渠道筛选影响）。')
. ' 签收与尾款时间不晚于结算月 7 日 24 点的计入「本期提成」，其余计入「顺延下期」。'
. '上期同渠道同部门范围内「确定业绩」产生的顺延订单并入本期。'
. '「按医助」「按医生」拆分按 (人 × 挂号渠道)：挂号渠道取最新已完成挂号 channels；未关联展示为「未匹配挂号渠道」。';
} else {
$ruleNoteFull = ($requireSysAutoPo
? '订单创建月为结算月的上一自然月；仅统计系统代开处方（is_system_auto=1）对应的履约已完成（默认 fulfillment_status=3）业务订单。 '
: '订单创建月为结算月的上一自然月；当前配置同时包含手动与系统代开关联处方（订单池更接近列表；财务请确认口径）。 ')
. '签收时间取物流签收最大值；尾款取关联支付单已支付时间（优先尾款/全部）。签收与尾款均不晚于结算月 7 日 24 点计入「本期提成」，其余计入「顺延下期」。结转规则同上。';
}
return [
'settlement_month' => $monthRaw,
'order_month' => $orderMonthLabel,
'cutoff_end' => date('Y-m-d H:i:s', $cutoffTs),
'rule_note' => '订单创建月为结算月的上一自然月；仅统计系统代开处方（is_system_auto=1）对应的履约已完成业务订单。签收时间取物流表签收时间最大值；尾款时间取关联支付单已支付记录（优先类型为尾款/全部）。签收与尾款均不晚于结算月 7 日 24 点的计入「本期提成」，其余已完成订单计入「顺延下期」。上期同渠道同部门范围内「确定业绩」产生的顺延订单，会计入本期订单池。「按医助下发」「按医生下发」按 (人 × 挂号渠道) 拆分；挂号渠道取该订单对应诊单的最新已完成挂号 doctor_appointment.channels（dict_data type_value=channels），如「复诊2」「自媒体1」等保持各自独立一行，未关联挂号统一展示为「未匹配挂号渠道」。',
'channel_code' => $c['channelCode'],
'channel_name' => $c['channelInfo'] ? (string) $c['channelInfo']['channel_name'] : '',
'scope_dept_ids_key' => $pack['deptKey'],
'carry_in_order_count' => $carryInCnt,
'confirm' => $confirm,
'rows' => $rows,
'assistant_rows' => $assistantRows,
'doctor_rows' => $doctorRows,
'assistant_channel_rows' => $assistantChannelRows,
'doctor_channel_rows' => $doctorChannelRows,
'total' => [
'settlement_month' => $monthRaw,
'order_month' => $orderMonthLabel,
'order_start_time' => $pack['orderStartTimeText'],
'order_end_time' => $pack['orderEndTimeText'],
'fulfillment_status' => $pack['fulfillmentStatus'],
'explicit_order_time_window' => $explicitOrderTimeWindow,
'cutoff_end' => date('Y-m-d H:i:s', $cutoffTs),
'rule_note' => $ruleNoteFull,
'channel_code' => $c['channelCode'],
'channel_name' => $c['channelInfo'] ? (string) $c['channelInfo']['channel_name'] : '',
'scope_dept_ids_key' => $pack['deptKey'],
'carry_in_order_count' => $carryInCnt,
'confirm' => $confirm,
'rows' => $rows,
'assistant_rows' => $assistantRows,
'doctor_rows' => $doctorRows,
'assistant_channel_rows' => $assistantChannelRows,
'doctor_channel_rows' => $doctorChannelRows,
'total' => [
'completed_order_count' => $sumCompletedCnt,
'completed_order_amount' => round($sumCompletedAmt, 2),
'current_period_count' => $sumCurCnt,
@@ -5734,13 +6086,14 @@ class YejiStatsLogic
'deferred_period_amount' => round($sumDefAmt, 2),
'carry_in_order_count' => $carryInCnt,
],
'require_system_auto_prescription' => $requireSysAutoPo,
];
}
/**
* 提成核对：订单明细（分页）。
*
* @param array{settlement_month?: string, dept_ids?: int[]|string, channel_code?: string, page?: int|string, page_size?: int|string, bucket?: string} $params bucket: 空|current|deferred
* @param array{settlement_month?: string, dept_ids?: int[]|string, channel_code?: string, page?: int|string, page_size?: int|string, bucket?: string, assistant_id?: int|string, doctor_id?: int|string, appt_channel_value?: int|string|null} $params bucket: 空|current|deferred；appt_channel_value 与其它筛选同时传递时一并生效（含 0=未匹配挂号渠道）
*
* @return array<string, mixed>
*/
@@ -5756,11 +6109,31 @@ class YejiStatsLogic
$bucket = trim((string) ($params['bucket'] ?? ''));
$page = max(1, (int) ($params['page'] ?? 1));
$pageSize = min(100, max(10, (int) ($params['page_size'] ?? 20)));
$filterAssistantId = max(0, (int) ($params['assistant_id'] ?? 0));
$filterDoctorId = max(0, (int) ($params['doctor_id'] ?? 0));
$filterApptChannelActive = array_key_exists('appt_channel_value', $params)
&& $params['appt_channel_value'] !== null
&& $params['appt_channel_value'] !== '';
$filterApptChannelVal = $filterApptChannelActive ? (int) $params['appt_channel_value'] : null;
if ($tableRowDeptIds === [] || $adminToPrimary === []) {
return ['list' => [], 'count' => 0, 'page' => $page, 'page_size' => $pageSize];
}
$cPack = $pack['c'];
$linesAssistScopeFlip = null;
if (!empty($cPack['dataScopeRestricted'])
&& isset($cPack['dataScopeVisibleAdminIds'])
&& $cPack['dataScopeVisibleAdminIds'] !== []) {
$linesAssistScopeFlip = array_flip(array_map('intval', $cPack['dataScopeVisibleAdminIds']));
}
$linesSelfAid = (int) ($pack['assistAttributionRestrictSelfId'] ?? 0);
if ($linesSelfAid > 0) {
$linesAssistScopeFlip = [$linesSelfAid => true];
}
$linesSkipPhpDs = !empty($pack['skipPhpDataScopeAttributionFilter']);
$query = self::commissionSettlementBuildFilteredOrderQuery($pack);
$att = $pack['att'];
$signPayFields = self::commissionSettlementSignPayFieldRawList();
@@ -5768,6 +6141,9 @@ class YejiStatsLogic
$baseRows = $query->field(array_merge([
'o.id',
'o.order_no',
'o.tracking_number',
'o.express_company',
'o.recipient_phone',
'o.diagnosis_id',
'o.create_time',
'o.amount',
@@ -5775,11 +6151,59 @@ class YejiStatsLogic
Db::raw('IFNULL(rx.creator_id, 0) AS doctor_id'),
], $signPayFields))->order('o.id', 'desc')->select()->toArray();
$diagIdSet = [];
foreach ($baseRows as $r) {
$dg = (int) ($r['diagnosis_id'] ?? 0);
if ($dg > 0) {
$diagIdSet[$dg] = true;
}
}
$diagKeys = array_keys($diagIdSet);
$diagToApptChannel = self::commissionSettlementDiagnosisLatestApptChannel($diagKeys);
$diagToApptDetail = self::commissionSettlementDiagnosisLatestCompletedAppointment($diagKeys);
$chValsForDict = [];
foreach ($diagToApptChannel as $v) {
$chValsForDict[] = (int) $v;
}
foreach ($diagToApptDetail as $drow) {
$chValsForDict[] = (int) ($drow['channels'] ?? 0);
}
$apptChannelsDictMap = self::commissionSettlementApptChannelsDictMap($chValsForDict);
$mapped = [];
foreach ($baseRows as $r) {
$dgId = (int) ($r['diagnosis_id'] ?? 0);
$apCh = (int) ($diagToApptChannel[$dgId] ?? 0);
if ($filterApptChannelActive && $apCh !== (int) $filterApptChannelVal) {
continue;
}
$preAid = (int) ($r['assistant_id'] ?? 0);
if (!$linesSkipPhpDs && $linesAssistScopeFlip !== null && ($preAid <= 0 || !isset($linesAssistScopeFlip[$preAid]))) {
continue;
}
if (!empty($cPack['explicitDeptFilter']) && ($preAid <= 0 || !isset($adminToPrimary[$preAid]))) {
continue;
}
$preDoctorId = (int) ($r['doctor_id'] ?? 0);
if ($filterAssistantId > 0 && $preAid !== $filterAssistantId) {
continue;
}
if ($filterDoctorId > 0 && $preDoctorId !== $filterDoctorId) {
continue;
}
$signTs = (int) ($r['sign_ts'] ?? 0);
$payTs = (int) ($r['pay_ts'] ?? 0);
$eligible = $signTs > 0 && $payTs > 0 && $signTs <= $cutoffTs && $payTs <= $cutoffTs;
$tnForSig = trim((string) ($r['tracking_number'] ?? ''));
if ($signTs <= 0 && $tnForSig !== '') {
$signTs = ExpressTrackingService::resolveSignUnixTimeForCommission(
$tnForSig,
(string) ($r['express_company'] ?? 'auto'),
(string) ($r['recipient_phone'] ?? ''),
true
);
}
$bucketMeta = self::commissionSettlementBucketEligible($signTs, $payTs, $cutoffTs);
$eligible = $bucketMeta['eligible'];
$b = $eligible ? 'current' : 'deferred';
if ($bucket === 'current' && $b !== 'current') {
continue;
@@ -5788,8 +6212,16 @@ class YejiStatsLogic
continue;
}
$oid = (int) ($r['id'] ?? 0);
$aid = (int) ($r['assistant_id'] ?? 0);
$doctorId = (int) ($r['doctor_id'] ?? 0);
$aid = $preAid;
$doctorId = $preDoctorId;
$apDet = $diagToApptDetail[$dgId] ?? null;
$chForLabel = \is_array($apDet) ? (int) ($apDet['channels'] ?? 0) : 0;
if ($chForLabel <= 0) {
$chForLabel = (int) ($diagToApptChannel[$dgId] ?? 0);
}
$apptDateRaw = \is_array($apDet) ? trim((string) ($apDet['appointment_date'] ?? '')) : '';
$apptStatus = \is_array($apDet) ? (int) ($apDet['appointment_status'] ?? 0) : 0;
$trackingNo = trim((string) ($r['tracking_number'] ?? ''));
$foldRows = [['assistant_id' => $aid, 'cnt' => 1]];
$byDept = self::foldPerformanceRowsToDeptByTable($foldRows, $adminToPrimary, $tableRowDeptIds, $deptById, 'cnt');
$primaryDeptId = 0;
@@ -5801,6 +6233,8 @@ class YejiStatsLogic
$mapped[] = [
'id' => $oid,
'order_no' => (string) ($r['order_no'] ?? ''),
'tracking_number' => $trackingNo,
'express_company' => trim((string) ($r['express_company'] ?? '')),
'diagnosis_id' => (int) ($r['diagnosis_id'] ?? 0),
'amount' => round((float) ($r['amount'] ?? 0), 2),
'create_time' => (int) ($r['create_time'] ?? 0),
@@ -5814,9 +6248,17 @@ class YejiStatsLogic
'assistant_name' => '',
'doctor_name' => '',
'bucket' => $b,
'bucket_defer_code' => $eligible ? '' : (string) ($bucketMeta['defer_code'] ?? ''),
'bucket_defer_text' => $eligible ? '' : (string) ($bucketMeta['defer_text'] ?? ''),
'is_carry_in' => $oid > 0 && isset($carryFlip[$oid]) ? 1 : 0,
'primary_dept_id' => $primaryDeptId,
'primary_dept_name' => $primaryDeptId > 0 ? self::formatYejiDeptRowDisplayName($primaryDeptId, $deptById) : '',
'appointment_id' => \is_array($apDet) ? (int) ($apDet['appointment_id'] ?? 0) : 0,
'appointment_date' => $apptDateRaw,
'appointment_date_text' => $apptDateRaw !== '' ? $apptDateRaw : '',
'appointment_status' => $apptStatus,
'appt_channel_value' => $chForLabel,
'appt_channel_name' => self::commissionSettlementApptChannelLabel($chForLabel, $apptChannelsDictMap),
];
}
@@ -5894,7 +6336,7 @@ class YejiStatsLogic
if ($exists) {
$ex = is_array($exists) ? $exists : $exists->toArray();
if ((int) ($ex['status'] ?? 0) === 1) {
throw new \think\Exception('已确定业绩的记录不可修改核对备注，如需更正请联系管理员处理数据');
throw new \think\Exception('当前为「已确定业绩」锁定状态，不可修改备注；请先「撤回确定」后再编辑');
}
Db::name('commission_settlement_confirm')->where('id', (int) $ex['id'])->update([
'reconcile_note' => $note,
@@ -5960,6 +6402,9 @@ class YejiStatsLogic
$rowsRaw = $query->field(array_merge([
'o.id',
'o.create_time',
'o.tracking_number',
'o.express_company',
'o.recipient_phone',
Db::raw("({$att}) AS assistant_id"),
], $signPayFields))->select()->toArray();
@@ -5967,8 +6412,18 @@ class YejiStatsLogic
foreach ($rowsRaw as $r) {
$signTs = (int) ($r['sign_ts'] ?? 0);
$payTs = (int) ($r['pay_ts'] ?? 0);
$eligible = $signTs > 0 && $payTs > 0 && $signTs <= $cutoffTs && $payTs <= $cutoffTs;
if (!$eligible) {
if ($signTs <= 0) {
$tn0 = trim((string) ($r['tracking_number'] ?? ''));
if ($tn0 !== '') {
$signTs = ExpressTrackingService::resolveSignUnixTimeForCommission(
$tn0,
(string) ($r['express_company'] ?? 'auto'),
(string) ($r['recipient_phone'] ?? ''),
true
);
}
}
if (!self::commissionSettlementBucketEligible($signTs, $payTs, $cutoffTs)['eligible']) {
$deferredIds[] = (int) ($r['id'] ?? 0);
}
}
@@ -6022,6 +6477,9 @@ class YejiStatsLogic
'confirmed_admin_id' => $viewerAdminId,
'confirmed_admin_name' => mb_substr($adminName, 0, 64),
'confirmed_at' => $t,
'revoked_at' => 0,
'revoked_admin_id' => 0,
'revoked_admin_name' => '',
'update_time' => $t,
]);
} else {
@@ -6035,6 +6493,9 @@ class YejiStatsLogic
'confirmed_admin_id' => $viewerAdminId,
'confirmed_admin_name' => mb_substr($adminName, 0, 64),
'confirmed_at' => $t,
'revoked_at' => 0,
'revoked_admin_id' => 0,
'revoked_admin_name' => '',
'create_time' => $t,
'update_time' => $t,
]);
@@ -6052,4 +6513,65 @@ class YejiStatsLogic
'deferred_carry_count' => count($deferredIds),
];
}
/**
* 撤回「确定本期业绩」：status 1→2，并删除本 scope 下因该次确定写入的顺延结转，避免下期重复汇入。
* 仅 status=1 时可撤回；撤回后可再次保存备注并重新确定（仍受 uk_scope 唯一行约束）。
*
* @param array{settlement_month?: string, dept_ids?: int[]|string, channel_code?: string} $params
*
* @return array{ok: bool}
*/
public static function commissionSettlementConfirmRevoke(array $params, int $viewerAdminId = 0, array $viewerAdminInfo = []): array
{
if ($viewerAdminId <= 0) {
throw new \think\Exception('未登录');
}
$pack = self::commissionSettlementResolveBasePack($params, $viewerAdminId, $viewerAdminInfo);
$tableRowDeptIds = $pack['tableRowDeptIds'];
$adminToPrimary = $pack['adminToPrimary'];
if ($tableRowDeptIds === [] || $adminToPrimary === []) {
throw new \think\Exception('当前账号无可操作的展示部门');
}
$exists = Db::name('commission_settlement_confirm')
->where('settlement_month', $pack['monthRaw'])
->where('scope_channel_code', $pack['scopeChannelCode'])
->where('scope_dept_ids_key', $pack['deptKey'])
->find();
if (!$exists) {
throw new \think\Exception('当前筛选下无核对记录，无需撤回');
}
$ex = is_array($exists) ? $exists : $exists->toArray();
if ((int) ($ex['status'] ?? 0) !== 1) {
throw new \think\Exception('仅「已确定业绩」状态可撤回；当前为草稿、或已撤回状态');
}
$adminName = (string) (Db::name('admin')->where('id', $viewerAdminId)->whereNull('delete_time')->value('name') ?: '');
$t = time();
Db::startTrans();
try {
Db::name('commission_settlement_carry')
->where('source_settlement_month', $pack['monthRaw'])
->where('scope_channel_code', $pack['scopeChannelCode'])
->where('scope_dept_ids_key', $pack['deptKey'])
->delete();
Db::name('commission_settlement_confirm')->where('id', (int) $ex['id'])->update([
'status' => 2,
'revoked_at' => $t,
'revoked_admin_id' => $viewerAdminId,
'revoked_admin_name' => mb_substr($adminName, 0, 64),
'update_time' => $t,
]);
Db::commit();
} catch (\Throwable $e) {
Db::rollback();
throw $e;
}
return ['ok' => true];
}
}
server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php
+161
View File
@@ -19,6 +19,7 @@ use app\common\model\auth\Admin;
use app\common\service\DataScope\DataScopeService;
use app\common\service\ExpressTrackService;
use app\common\service\gancao\GancaoScmRecipelService;
use think\db\Query;
use think\facade\Config;
use think\facade\Db;
use think\facade\Log;
@@ -268,6 +269,166 @@ class PrescriptionOrderLogic
return self::roleIntersect($adminInfo, $allow);
}
/**
* 与业务订单列表金额统计一致：命中「统计医助」角色且非农单支付审核档时，业务侧按「仅限本人关联诊单的业绩域」收口。
* 提成结算等对业绩归因 SQL 收窄时需与之对齐。
*/
public static function statsRestrictedToOwnAssistantPerformanceDomain(array $adminInfo): bool
{
if (!empty($adminInfo['root']) && (int) $adminInfo['root'] === 1) {
return false;
}
if (self::canViewOrderListStatsAllScope($adminInfo)) {
return false;
}
$assistantRid = (int) Config::get('project.prescription_order_stats_assistant_role_id', 2);
return $assistantRid > 0 && self::roleIntersect($adminInfo, [$assistantRid]);
}
/**
* 提成结算等与列表对齐：按开方医生 / 诊单医助 ∪ 订单创建人 筛选（与 PrescriptionOrderLists::applyDoctorAssistantFilters 在非业绩抽屉场景一致）。
*
* @param array<string, mixed> $params
*/
public static function applyCommissionOrderDoctorAssistantFilters(Query $query, string $alias, array $params): void
{
if (isset($params['doctor_id']) && (int) $params['doctor_id'] > 0) {
$doctorId = (int) $params['doctor_id'];
$rxTbl = (new Prescription())->getTable();
$query->whereExists(
"SELECT 1 FROM `{$rxTbl}` rx WHERE rx.`id` = `{$alias}`.`prescription_id` "
. "AND rx.`delete_time` IS NULL AND rx.`creator_id` = {$doctorId}"
);
}
if (isset($params['assistant_id']) && (int) $params['assistant_id'] > 0) {
$assistantId = (int) $params['assistant_id'];
$diagTbl = (new Diagnosis())->getTable();
$query->where(function ($q) use ($alias, $diagTbl, $assistantId): void {
$q->where("{$alias}.creator_id", $assistantId);
$q->whereOrRaw(
"EXISTS (SELECT 1 FROM `{$diagTbl}` dg WHERE dg.`id` = `{$alias}`.`diagnosis_id`"
. " AND dg.`delete_time` IS NULL AND dg.`assistant_id` = {$assistantId})"
);
});
}
}
/**
* 与处方订单列表 HasDataScopeFilter + applyCreatorOrOwnPrescriptionVisibility 等价；主业务订单别名 $alias。
*
* @param array<string, mixed> $params 可含 assistant_id（显式收窄时校验数据域）
*/
public static function applyPrescriptionOrderListAccessForCommissionQuery(
Query $query,
string $alias,
int $viewerAdminId,
array $viewerAdminInfo,
array $params = []
): void {
if ($viewerAdminId <= 0) {
return;
}
self::applyCommissionOrderDoctorAssistantFilters($query, $alias, $params);
if (self::canSeeAllPrescriptionOrders($viewerAdminInfo)) {
self::applyCommissionOrderDataScope($query, $alias, $viewerAdminId, $viewerAdminInfo);
return;
}
$rxTbl = (new Prescription())->getTable();
$diagTbl = (new Diagnosis())->getTable();
$explicitAssistant = (int) ($params['assistant_id'] ?? 0);
$allowExplicitAssistantVisibility = false;
if ($explicitAssistant > 0) {
if (!DataScopeService::isEnabled()) {
$allowExplicitAssistantVisibility = true;
} else {
$visibleIds = DataScopeService::getVisibleAdminIds($viewerAdminId, $viewerAdminInfo);
if ($visibleIds === null || in_array($explicitAssistant, $visibleIds, true)) {
$allowExplicitAssistantVisibility = true;
}
}
}
$query->where(function ($q) use (
$alias,
$rxTbl,
$diagTbl,
$viewerAdminId,
$explicitAssistant,
$allowExplicitAssistantVisibility,
$viewerAdminInfo
): void {
if (self::canViewOrdersForOwnPrescription($viewerAdminInfo)) {
$q->where(function ($qq) use ($alias, $rxTbl, $diagTbl, $viewerAdminId): void {
$qq->where("{$alias}.creator_id", $viewerAdminId);
$qq->whereOrRaw(
"EXISTS (SELECT 1 FROM `{$rxTbl}` rx WHERE rx.`id` = `{$alias}`.`prescription_id`"
. " AND rx.`delete_time` IS NULL AND rx.`creator_id` = {$viewerAdminId})"
);
$qq->whereOrRaw(
"EXISTS (SELECT 1 FROM `{$diagTbl}` dg WHERE dg.`id` = `{$alias}`.`diagnosis_id`"
. " AND dg.`delete_time` IS NULL AND dg.`assistant_id` = {$viewerAdminId})"
);
});
} else {
$q->where(function ($qq) use ($alias, $diagTbl, $viewerAdminId): void {
$qq->where("{$alias}.creator_id", $viewerAdminId);
$qq->whereOrRaw(
"EXISTS (SELECT 1 FROM `{$diagTbl}` dg WHERE dg.`id` = `{$alias}`.`diagnosis_id`"
. " AND dg.`delete_time` IS NULL AND dg.`assistant_id` = {$viewerAdminId})"
);
});
}
if ($allowExplicitAssistantVisibility) {
$q->whereOr("{$alias}.creator_id", $explicitAssistant);
$q->whereOrRaw(
"EXISTS (SELECT 1 FROM `{$diagTbl}` dg WHERE dg.`id` = `{$alias}`.`diagnosis_id`"
. " AND dg.`delete_time` IS NULL AND dg.`assistant_id` = {$explicitAssistant})"
);
}
});
self::applyCommissionOrderDataScope($query, $alias, $viewerAdminId, $viewerAdminInfo);
}
/**
* 列表数据域：创建人 ∈ 可见 或 诊单医助 ∈ 可见。
*/
private static function applyCommissionOrderDataScope(
Query $query,
string $alias,
int $viewerAdminId,
array $viewerAdminInfo
): void {
if (!DataScopeService::isEnabled()) {
return;
}
$ids = DataScopeService::getVisibleAdminIds($viewerAdminId, $viewerAdminInfo);
if ($ids === null) {
return;
}
if ($ids === []) {
$query->whereRaw('0 = 1');
return;
}
$diagTbl = (new Diagnosis())->getTable();
$inList = implode(',', array_map('intval', $ids));
$query->where(function ($q) use ($alias, $diagTbl, $inList): void {
$q->whereIn("{$alias}.creator_id", explode(',', $inList));
$q->whereOrRaw(
"EXISTS (SELECT 1 FROM `{$diagTbl}` dg WHERE dg.`id` = `{$alias}`.`diagnosis_id` "
. "AND dg.`delete_time` IS NULL AND dg.`assistant_id` IN ({$inList}))"
);
});
}
/**
* @param array<string,mixed> $row
*/
server/app/common/service/ExpressTrackingService.php
+233
View File
@@ -862,4 +862,237 @@ class ExpressTrackingService
return $data;
}
/**
* 与 PrescriptionOrderLogic::logisticsTrace 一致：优先库表 express_tracking + express_trace；
* 库内算不出签收时（或库无记录），可选走快递100（与详情「刷新轨迹」同源）。
*
* 提成结算 orderLines 等对 SQL JOIN 无法覆盖「仅 API 有轨迹」的运单做补算。
*
* @param bool $queryKuaidiWhenDbUnusable true 时与 logisticsTrace 完全同路径；false 时仅数据库推导（overview 大批量避免 HTTP）
*/
public static function resolveSignUnixTimeForCommission(
string $trackingNumber,
string $expressCompany,
string $recipientPhone,
bool $queryKuaidiWhenDbUnusable = true
): int {
$num = trim($trackingNumber);
if ($num === '') {
return 0;
}
$cacheKey = $num . '|' . ($queryKuaidiWhenDbUnusable ? '1' : '0');
static $memo = [];
if (isset($memo[$cacheKey])) {
return $memo[$cacheKey];
}
$detail = self::loadTrackingDetailNormalized($num);
if (is_array($detail)) {
$fromDb = self::effectiveSignUnixFromTrackingDetail($detail);
if ($fromDb > 0) {
$memo[$cacheKey] = $fromDb;
return $fromDb;
}
}
if (!$queryKuaidiWhenDbUnusable) {
$memo[$cacheKey] = 0;
return 0;
}
$ec = strtolower(trim($expressCompany));
if ($ec === '') {
$ec = 'auto';
}
$api = ExpressTrackService::query($ec, $num, $recipientPhone, '');
$fromApi = self::effectiveSignUnixFromKuaidiPayload($api);
$memo[$cacheKey] = $fromApi;
return $fromApi;
}
/**
* 单号精确匹配失败时尝试 TRIM(TrackingNumber)（历史数据首尾空格）。
*
* @return array<string, mixed>|null
*/
private static function loadTrackingDetailNormalized(string $trackingNumber): ?array
{
$n = trim($trackingNumber);
if ($n === '') {
return null;
}
$first = self::getDetailByTrackingNumber($n);
if ($first !== null) {
return $first;
}
$tracking = ExpressTracking::with(['traces' => function ($query) {
$query->order('trace_time_stamp', 'desc');
}])
->whereRaw('TRIM(`tracking_number`) = ?', [$n])
->whereNull('delete_time')
->find();
if (!$tracking) {
return null;
}
$data = $tracking->toArray();
$data['traces'] = $tracking->traces ? $tracking->traces->toArray() : [];
return $data;
}
/**
* 与 YejiStatsLogic 物流子查询中每条 express_tracking 的 GREATEST 语义对齐。
*
* @param array<string, mixed> $detail getDetail* / loadTrackingDetailNormalized 结果
*/
private static function effectiveSignUnixFromTrackingDetail(array $detail): int
{
$a = (int) ($detail['sign_time'] ?? 0);
$traces = $detail['traces'] ?? [];
if (!is_array($traces)) {
$traces = [];
}
$b = 0;
foreach ($traces as $tr) {
if (!is_array($tr)) {
continue;
}
if (!self::dbTraceRowLooksSigned($tr)) {
continue;
}
$ts = self::traceRowToUnix($tr);
if ($ts > 0) {
$b = max($b, $ts);
}
}
$c = 0;
$stateOk = ((string) ($detail['current_state'] ?? '') === ExpressTracking::STATE_SIGNED
|| (int) ($detail['is_signed'] ?? 0) === 1);
if ($stateOk) {
foreach ($traces as $tr) {
if (!is_array($tr)) {
continue;
}
$ts = self::traceRowToUnix($tr);
if ($ts > 0) {
$c = max($c, $ts);
}
}
}
return max($a, $b, $c);
}
/**
* @param array<string, mixed> $tr express_trace 行
*/
private static function dbTraceRowLooksSigned(array $tr): bool
{
$code = (string) ($tr['status_code'] ?? '');
if (in_array($code, ['3', '301', '302', '304'], true)) {
return true;
}
$st = (string) ($tr['status'] ?? '');
$ctx = (string) ($tr['trace_context'] ?? '');
$hay = $st . ' ' . $ctx;
foreach (['签收', '妥投', '已送达', '本人签收'] as $k) {
if (mb_stripos($hay, $k) !== false) {
return true;
}
}
return false;
}
/**
* @param array<string, mixed> $tr
*/
private static function traceRowToUnix(array $tr): int
{
$ts = (int) ($tr['trace_time_stamp'] ?? 0);
if ($ts > 0) {
return $ts;
}
$raw = trim((string) ($tr['trace_time'] ?? ''));
if ($raw === '') {
return 0;
}
$p = strtotime($raw);
return $p !== false ? (int) $p : 0;
}
/**
* @param array<string, mixed> $api ExpressTrackService::query 返回值
*/
private static function effectiveSignUnixFromKuaidiPayload(array $api): int
{
$traces = $api['traces'] ?? [];
if (!is_array($traces) || $traces === []) {
return 0;
}
$state = (string) ($api['state'] ?? '');
$best = 0;
foreach ($traces as $row) {
if (!is_array($row)) {
continue;
}
$tstr = (string) ($row['time'] ?? '');
$ctx = (string) ($row['context'] ?? '');
$p = strtotime($tstr);
$ts = $p !== false ? (int) $p : 0;
if ($ts <= 0) {
continue;
}
$signedLike = self::plainContextLooksSigned($ctx);
if ($signedLike) {
$best = max($best, $ts);
}
}
if ($best > 0) {
return $best;
}
if ($state === '3') {
foreach ($traces as $row) {
if (!is_array($row)) {
continue;
}
$tstr = (string) ($row['time'] ?? '');
$p = strtotime($tstr);
$ts = $p !== false ? (int) $p : 0;
if ($ts > 0) {
$best = max($best, $ts);
}
}
}
return $best;
}
private static function plainContextLooksSigned(string $context): bool
{
foreach (['签收', '妥投', '已送达', '本人签收', '快件已送达'] as $k) {
if (mb_stripos($context, $k) !== false) {
return true;
}
}
return false;
}
}
server/config/project.php
+10
View File
@@ -137,6 +137,16 @@ return [
'exempt_roles' => [],
],
/*
* 提成结算 stats.commissionSettlement（YejiStatsLogic）
* require_system_auto_prescription：true（默认）仅系统代开口径（is_system_auto=1），常与订单列表「全部已完成」条数不一致。
* false 时与列表一致纳入手动开方单（仍需履约完成、业绩归因等其它条件）。
* .env 可选：commission_settlement.require_system_auto = 1|0 ，未配置时读本项。
*/
'commission_settlement' => [
'require_system_auto_prescription' => (int) env('commission_settlement.require_system_auto', 1) === 1,
],
// 腾讯云实时音视频(TRTC)配置
'trtc' => [
'sdkAppId' => (int)env('trtc.sdk_app_id', 1600127710),
server/sql/1.9.20260513/commission_settlement_confirm_revoke.sql
+8
View File
@@ -0,0 +1,8 @@
-- 提成结算：支持「撤回已确定业绩」标记与审计字段
-- status：0=已保存核对 1=已确定业绩（锁定，不可重复确定）2=已撤回确定（可再次核对/确定，顺延结转已清除）
ALTER TABLE `zyt_commission_settlement_confirm`
MODIFY COLUMN `status` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '0已保存核对 1已确定业绩(锁定) 2已撤回确定',
ADD COLUMN `revoked_at` int unsigned NOT NULL DEFAULT 0 COMMENT '撤回确定时间戳' AFTER `confirmed_at`,
ADD COLUMN `revoked_admin_id` int unsigned NOT NULL DEFAULT 0 COMMENT '撤回操作人' AFTER `revoked_at`,
ADD COLUMN `revoked_admin_name` varchar(64) NOT NULL DEFAULT '' COMMENT '撤回操作人姓名' AFTER `revoked_admin_id`;