zhongchuang
/
admin-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复：结算豆豆信息前 订单已完成，会导致痘痘的积分一致在冻结中

This commit is contained in:
wuhui_zzw 2024-01-29 12:52:12 +08:00
parent c859baa874
commit 3a583c6536
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/jobs/store/platformCommission/SparateLegumesJob.php
View File

@ -29,7 +29,7 @@ class SparateLegumesJob implements JobInterface{
if((int)$cycleLegumes['status'] != 0) throw new \Exception('当前豆豆已分配！'); if((int)$cycleLegumes['status'] != 0) throw new \Exception('当前豆豆已分配！');
// 获取时间段所有消费用户 // 获取时间段所有消费用户
$orderList = StoreOrder::whereNotIn('status',[-1,11]) $orderList = StoreOrder::whereNotIn('status',[-1,11])
->field('order_id,uid,(sum(pay_price) + sum(use_legumes_integral)) as sum_money') ->field('order_id,uid,status,(sum(pay_price) + sum(use_legumes_integral)) as sum_money')
->whereBetweenTime('pay_time',$cycleLegumes['start_time'],$cycleLegumes['end_time']) ->whereBetweenTime('pay_time',$cycleLegumes['start_time'],$cycleLegumes['end_time'])
->group('order_id') ->group('order_id')
->select() ->select()
@ -62,6 +62,7 @@ class SparateLegumesJob implements JobInterface{
'order_money' => $orderInfo['sum_money'], 'order_money' => $orderInfo['sum_money'],
'order_money_rate' => $rate, 'order_money_rate' => $rate,
'get_legumes' => $getLegumes, 'get_legumes' => $getLegumes,
'status' => in_array((int)$orderInfo['status'],[2,3]) ? 1 : 0,
]; ];
} }
// 添加数据 // 添加数据