feat: 优化腾讯地图地址选点插件,完善订单管理与分销服务
这个提交包含在:
@@ -80,40 +80,70 @@ class Order extends Backend
|
||||
}
|
||||
|
||||
/**
|
||||
* 订单补单
|
||||
* 订单补单(含权益发放与分销结算)
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function supplement()
|
||||
{
|
||||
$orderNo = $this->request->post('orderNo');
|
||||
if (trim((string)$orderNo) === '') {
|
||||
$orderNo = trim((string)$this->request->post('orderNo', ''));
|
||||
if ($orderNo === '') {
|
||||
$this->error('订单号不能为空');
|
||||
}
|
||||
$order = Db::name('fc_order')->where('order_no', $orderNo)->find();
|
||||
if (!$order) {
|
||||
$this->error('订单不存在');
|
||||
}
|
||||
if ($order['status'] === 'paid') {
|
||||
if ((string)$order['status'] === 'paid') {
|
||||
$this->success('订单已支付');
|
||||
}
|
||||
Db::name('fc_order')->where('id', $order['id'])->update([
|
||||
'status' => 'paid',
|
||||
'paytime' => time(),
|
||||
'updatetime' => time(),
|
||||
]);
|
||||
Db::name('fc_finance_flow')->insert([
|
||||
'user_id' => (int)$order['user_id'],
|
||||
'flow_no' => 'SK' . date('YmdHis') . $order['id'],
|
||||
'type' => 'income',
|
||||
'scene' => '订单补单',
|
||||
'amount' => $order['amount'],
|
||||
'balance' => 0,
|
||||
'related_id' => $order['id'],
|
||||
'remark' => '订单补单',
|
||||
'createtime' => time(),
|
||||
]);
|
||||
if ((string)$order['status'] !== 'pending') {
|
||||
$this->error('订单状态不支持补单(当前:' . $order['status'] . ')');
|
||||
}
|
||||
|
||||
$now = time();
|
||||
try {
|
||||
Db::transaction(function () use ($order, $now) {
|
||||
$locked = Db::name('fc_order')->where('id', (int)$order['id'])->lock(true)->find();
|
||||
if (!$locked || (string)$locked['status'] !== 'pending') {
|
||||
return;
|
||||
}
|
||||
|
||||
$affected = Db::name('fc_order')
|
||||
->where('id', (int)$order['id'])
|
||||
->where('status', 'pending')
|
||||
->update([
|
||||
'status' => 'paid',
|
||||
'paytime' => $now,
|
||||
'updatetime' => $now,
|
||||
]);
|
||||
if (!$affected) {
|
||||
return;
|
||||
}
|
||||
|
||||
$locked['status'] = 'paid';
|
||||
$locked['paytime'] = $now;
|
||||
|
||||
Db::name('fc_finance_flow')->insert([
|
||||
'user_id' => (int)$locked['user_id'],
|
||||
'flow_no' => 'SK' . date('YmdHis') . $locked['id'],
|
||||
'type' => 'income',
|
||||
'scene' => '订单补单',
|
||||
'amount' => $locked['amount'],
|
||||
'balance' => 0,
|
||||
'related_id' => $locked['id'],
|
||||
'remark' => '订单补单',
|
||||
'createtime' => $now,
|
||||
]);
|
||||
|
||||
// 统一发放订单权益(会员开通 / 余额充值入账 / 付费查看解锁 / 发帖激活)并触发分销佣金结算
|
||||
\app\common\library\OrderFulfill::handle($locked);
|
||||
});
|
||||
} catch (\Throwable $e) {
|
||||
\think\Log::record('后台订单补单失败:订单 ' . $orderNo . ',' . $e->getMessage(), 'error');
|
||||
$this->error('补单失败:' . $e->getMessage());
|
||||
}
|
||||
|
||||
$this->success('补单成功');
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
在新工单中引用
屏蔽一个用户