From 3bdfb914ede382f6125e84d2487dd77d5813b5ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Mon, 15 Mar 2021 18:34:20 +0800
Subject: [PATCH] Update UserRebate.php
---
app/data/controller/UserRebate.php | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/app/data/controller/UserRebate.php b/app/data/controller/UserRebate.php
index 66d62c031..7fcfc55e4 100644
--- a/app/data/controller/UserRebate.php
+++ b/app/data/controller/UserRebate.php
@@ -58,9 +58,13 @@ class UserRebate extends Controller
$goodsItem = $this->app->db->name('ShopOrderItem')->whereIn('order_no', array_unique(array_column($data, 'order_no')))->select();
foreach ($data as &$vo) {
[$vo['user'], $vo['agent'], $vo['list']] = [[], [], []];
- foreach ($userItem as $user) if ($user['id'] === $vo['uid']) $vo['agent'] = $user;
- foreach ($userItem as $user) if ($user['id'] === $vo['order_uid']) $vo['user'] = $user;
- foreach ($goodsItem as $goods) if ($goods['order_no'] === $vo['order_no']) $vo['list'][] = $goods;
+ foreach ($userItem as $user) {
+ if ($user['id'] === $vo['uid']) $vo['agent'] = $user;
+ if ($user['id'] === $vo['order_uid']) $vo['user'] = $user;
+ }
+ foreach ($goodsItem as $goods) {
+ if ($goods['order_no'] === $vo['order_no']) $vo['list'][] = $goods;
+ }
}
}