xuanchen/pingan_unionpay_new
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

调整渠道数据统计

Browse Source
This commit is contained in:
徐永宾
2021-02-22 17:13:46 +08:00
parent d2bf54ef9e
commit a04494c30e
3 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Merchant/Controllers/Census/IndexController.php
View File

@@ -6,6 +6,7 @@ use App\Merchant\Controllers\Controller;
use App\Merchant\Exporters\CensusExport;
use App\Models\ActivityRule;
use App\Models\Coupon;
use App\Models\UserCode;
use Auth;
use Illuminate\Http\Request;
@@ -21,26 +22,23 @@ class IndexController extends Controller
$coupons = Coupon::where('user_id', $user->id)
->whereYear('created_at', $month[0])
->whereMonth('created_at', $month[1])
// ->whereMonth('created_at', $month[1])
->where('status', 2)
->get(['id', 'thirdPartyGoodsId', 'created_at']);
$rules = ActivityRule::get();
$rules = $user->code;
$coupons = $coupons->groupBy('create_day')->map(function ($items, $key) use ($rules) {
$data = [
'day' => $key,
// 'ysd10' => $items->where('thirdPartyGoodsId', 'YSD-full100-10')->count(),
// 'ysd25' => $items->where('thirdPartyGoodsId', 'YSD-full100-25')->count(),
// 'ysd50' => $items->where('thirdPartyGoodsId', 'YSD-full100-50')->count(),
// 'ysd100' => $items->where('thirdPartyGoodsId', 'YSD-full200-100')->count(),
];
foreach ($rules as $rule) {
$data[$rule->code] = $items->where('thirdPartyGoodsId', $rule->code)->count();
}
$coupons = $coupons->groupBy('create_day')
->map(function ($items, $key) use ($rules) {
$data = [
'day' => $key,
];
foreach ($rules as $rule) {
$data[$rule->code] = $items->where('thirdPartyGoodsId', $rule->code)->count();
}
return collect($data);
});
return collect($data);
});
$all = [];
foreach ($rules as $rule) {