fix(shopro): 修复拼团参团记录与后台订单展示时机

支付成功后正确识别 buy_type 并写入参团记录,我的拼团仅展示已支付订单。

后台与门店订单列表默认隐藏拼团进行中订单,成团成功后再进入备货/发货流程。

纳入版本库:Groupon、ActivityGroupon、OrderScope、Create 等 addons 拼团相关改动。

Co-authored-by: Cursor <cursoragent@cursor.com>
这个提交包含在:
可乐加冰
2026-09-23 23:03:45 +08:00
父节点 eb31a121f6
当前提交 d11c2bc0fa
共有 6 个文件被更改,包括 1528 次插入 和 0 次删除

查看文件

@@ -0,0 +1,300 @@
<?php
namespace addons\shopro\library\traits\model\order;
use addons\shopro\library\Wechat;
use addons\shopro\model\Order;
use addons\shopro\model\OrderItem;
use addons\shopro\model\Store;
use think\Cache;
trait OrderScope
{
// 已失效
public function scopeInvalid($query)
{
return $query->where('status', Order::STATUS_INVALID);
}
// 已取消
public function scopeCancel($query)
{
return $query->where('status', Order::STATUS_CANCEL);
}
// 未支付
public function scopeNopay($query)
{
return $query->where('status', Order::STATUS_NOPAY);
}
// 未发货
public function scopeNosend($query)
{
$where = [
'dispatch_status' => OrderItem::DISPATCH_STATUS_NOSEND,
'refund_status' => ['not in', [OrderItem::REFUND_STATUS_OK, OrderItem::REFUND_STATUS_FINISH]] // 没有退款完成
];
return $query->whereExists(function ($query) use ($where) {
$order_table_name = (new Order())->getQuery()->getTable();
$table_name = (new OrderItem())->getQuery()->getTable();
$query->table($table_name)->where('order_id=' . $order_table_name . '.id')->where($where);
})->whereNotExists(function ($query) use($where) {
$order_table_name = (new Order())->getQuery()->getTable();
$table_name = (new OrderItem())->getQuery()->getTable();
$query->table($table_name)->where('order_id=' . $order_table_name . '.id')->where(['aftersale_status' => OrderItem::AFTERSALE_STATUS_AFTERING])->where($where);
});
}
// 待收货
public function scopeNoget($query)
{
$where = [
'dispatch_status' => OrderItem::DISPATCH_STATUS_SENDED,
'refund_status' => ['not in', [OrderItem::REFUND_STATUS_OK, OrderItem::REFUND_STATUS_FINISH]] // 没有退款完成
];
return $query->whereExists(function ($query) use ($where) {
$order_table_name = (new Order())->getQuery()->getTable();
$table_name = (new OrderItem())->getQuery()->getTable();
$query->table($table_name)->where('order_id=' . $order_table_name . '.id')->where($where);
});
}
// 待评价
public function scopeNocomment($query)
{
$where = [
'dispatch_status' => OrderItem::DISPATCH_STATUS_GETED,
'refund_status' => ['not in', [OrderItem::REFUND_STATUS_OK, OrderItem::REFUND_STATUS_FINISH]], // 没有退款完成
'comment_status' => OrderItem::COMMENT_STATUS_NO
];
return $query->whereExists(function ($query) use ($where) {
$order_table_name = (new Order())->getQuery()->getTable();
$table_name = (new OrderItem())->getQuery()->getTable();
$query->table($table_name)->where('order_id=' . $order_table_name . '.id')->where($where);
});
}
// 售后 (后台要用,虽然有专门的售后单列表)
public function scopeAftersale($query)
{
return $query->whereExists(function ($query) {
$order_table_name = (new Order())->getQuery()->getTable();
$table_name = (new OrderItem())->getQuery()->getTable();
$query->table($table_name)->where('order_id=' . $order_table_name . '.id')
->where('aftersale_status', '<>', OrderItem::AFTERSALE_STATUS_NOAFTER);
// ->where(function($query) {
// // 只要申请过售后都算
// $query->where('aftersale_status', '<>', OrderItem::AFTERSALE_STATUS_NOAFTER)
// ->whereOr('refund_status', '<>', OrderItem::REFUND_STATUS_NOREFUND);
// });
});
}
// 退款 (即将废弃,有专门的售后单列表)
public function scopeRefundStatus($query)
{
$where = [
'refund_status' => ['<>', OrderItem::REFUND_STATUS_NOREFUND], // 只要申请过退款
];
return $query->whereExists(function ($query) use ($where) {
$order_table_name = (new Order())->getQuery()->getTable();
$table_name = (new OrderItem())->getQuery()->getTable();
$query->table($table_name)->where('order_id=' . $order_table_name . '.id')->where($where);
});
}
// 已支付
public function scopePayed($query)
{
return $query->where('status', 'in', [Order::STATUS_PAYED, Order::STATUS_FINISH]);
}
/**
* 排除拼团进行中的订单(成团成功后再进入待发货/备货流程)
*/
public function scopeExcludeGrouponIng($query)
{
$orderTable = (new Order())->getQuery()->getTable();
$grouponTable = (new \addons\shopro\model\ActivityGroupon())->getQuery()->getTable();
return $query->whereNotExists(function ($sub) use ($orderTable, $grouponTable) {
$sub->table($grouponTable)
->whereRaw($grouponTable . '.id = CAST(JSON_UNQUOTE(JSON_EXTRACT(' . $orderTable . '.ext, "$.groupon_id")) AS UNSIGNED)')
->where($grouponTable . '.status', 'ing');
});
}
// 已完成
public function scopeFinish($query)
{
return $query->where('status', Order::STATUS_FINISH);
}
public function scopeCanAftersale($query)
{
return $query->where('status', 'in', [Order::STATUS_PAYED, Order::STATUS_FINISH]);
}
public function scopeCanDelete($query)
{
return $query->where('status', 'in', [
Order::STATUS_CANCEL,
Order::STATUS_INVALID,
Order::STATUS_FINISH
]);
}
// 门店订单 scope
// 获取门店 id 条件
private function getStoreWhere($store_id) {
$where = [];
if ($store_id == 'current') {
// 默认手机商户端,取当前登陆的门店
$store = Store::info();
$where['store_id'] = $store['id'];
} else {
if ($store_id) {
$where['store_id'] = $store_id;
} else {
$where['store_id'] = ['<>', 0];
}
}
return $where;
}
/**
* 全部订单
*/
public function scopeStore($query, $store_id = 'current')
{
$where = $this->getStoreWhere($store_id);
return $query->whereExists(function ($query) use ($where) {
$order_table_name = (new Order())->getQuery()->getTable();
$table_name = (new OrderItem())->getQuery()->getTable();
$query->table($table_name)->where('order_id=' . $order_table_name . '.id')->where($where);
});
}
/**
* 未发货
*/
public function scopeStoreNosend($query, $store_id = 'current') {
$where = [
'dispatch_status' => OrderItem::DISPATCH_STATUS_NOSEND,
'refund_status' => ['not in', [OrderItem::REFUND_STATUS_OK, OrderItem::REFUND_STATUS_FINISH]] // 没有退款完成
];
$where = array_merge($where, $this->getStoreWhere($store_id));
return $query->whereExists(function ($query) use ($where) {
$order_table_name = (new Order())->getQuery()->getTable();
$table_name = (new OrderItem())->getQuery()->getTable();
$query->table($table_name)->where('order_id=' . $order_table_name . '.id')->where($where);
});
}
/**
* 未收货
*/
public function scopeStoreNoget($query, $store_id = 'current') {
$where = [
'dispatch_status' => OrderItem::DISPATCH_STATUS_SENDED,
'refund_status' => ['not in', [OrderItem::REFUND_STATUS_OK, OrderItem::REFUND_STATUS_FINISH]] // 没有退款完成
];
$where = array_merge($where, $this->getStoreWhere($store_id));
return $query->whereExists(function ($query) use ($where) {
$order_table_name = (new Order())->getQuery()->getTable();
$table_name = (new OrderItem())->getQuery()->getTable();
$query->table($table_name)->where('order_id=' . $order_table_name . '.id')->where($where);
});
}
// 待评价
public function scopeStoreNocomment($query, $store_id = 'current')
{
$where = [
'dispatch_status' => OrderItem::DISPATCH_STATUS_GETED,
'refund_status' => ['not in', [OrderItem::REFUND_STATUS_OK, OrderItem::REFUND_STATUS_FINISH]], // 没有退款完成
'comment_status' => OrderItem::COMMENT_STATUS_NO
];
$where = array_merge($where, $this->getStoreWhere($store_id));
return $query->whereExists(function ($query) use ($where) {
$order_table_name = (new Order())->getQuery()->getTable();
$table_name = (new OrderItem())->getQuery()->getTable();
$query->table($table_name)->where('order_id=' . $order_table_name . '.id')->where($where);
});
}
// 门店售后订单
public function scopeStoreAftersale($query, $store_id = 'current')
{
$where = [
'aftersale_status' => ['<>', OrderItem::AFTERSALE_STATUS_NOAFTER]
];
$where = array_merge($where, $this->getStoreWhere($store_id));
return $query->whereExists(function ($query) use ($where) {
$order_table_name = (new Order())->getQuery()->getTable();
$table_name = (new OrderItem())->getQuery()->getTable();
$query->table($table_name)->where('order_id=' . $order_table_name . '.id')->where($where);
});
}
// 退款
public function scopeStoreRefundStatus($query, $store_id = 'current')
{
$where = [
'refund_status' => ['<>', OrderItem::REFUND_STATUS_NOREFUND], // 只要申请过退款
];
$where = array_merge($where, $this->getStoreWhere($store_id));
return $query->whereExists(function ($query) use ($where) {
$order_table_name = (new Order())->getQuery()->getTable();
$table_name = (new OrderItem())->getQuery()->getTable();
$query->table($table_name)->where('order_id=' . $order_table_name . '.id')->where($where);
});
}
/**
* 已完成,这个只手机门店订单查询
*/
public function scopeStoreFinish($query) {
$store = Store::info();
// 收完货就算已完成
$where = [
'store_id' => $store['id'],
'dispatch_status' => OrderItem::DISPATCH_STATUS_GETED,
'refund_status' => ['not in', [OrderItem::REFUND_STATUS_OK, OrderItem::REFUND_STATUS_FINISH]] // 没有退款完成
];
return $query->whereExists(function ($query) use ($where) {
$order_table_name = (new Order())->getQuery()->getTable();
$table_name = (new OrderItem())->getQuery()->getTable();
$query->table($table_name)->where('order_id=' . $order_table_name . '.id')->where($where);
});
}
}