测试
This commit is contained in:
@@ -6,6 +6,7 @@ use App\Merchant\Controllers\Controller;
|
||||
use App\Models\ActivityRule;
|
||||
use App\Models\Coupon;
|
||||
use Auth;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class IndexController extends Controller
|
||||
@@ -84,9 +85,10 @@ class IndexController extends Controller
|
||||
|
||||
/**
|
||||
* 按照日期分润
|
||||
* @author 玄尘 2020-03-11
|
||||
*
|
||||
* @param Request $request [description]
|
||||
* @return array|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
* @author 玄尘 2020-03-11
|
||||
*/
|
||||
public function profits(Request $request)
|
||||
{
|
||||
@@ -115,9 +117,10 @@ class IndexController extends Controller
|
||||
|
||||
/**
|
||||
* 分润
|
||||
* @author 玄尘 2020-03-11
|
||||
*
|
||||
* @param Coupon $coupon [description]
|
||||
* @return [type] [description]
|
||||
* @author 玄尘 2020-03-11
|
||||
*/
|
||||
public function profit(Coupon $coupon)
|
||||
{
|
||||
@@ -269,13 +272,14 @@ class IndexController extends Controller
|
||||
$query->whereIn('status', [2, 3]);
|
||||
})
|
||||
->when($request->start && $request->end, function ($query) use ($request) {
|
||||
$query->whereBetween('updated_at', [$request->start, $request->end]);
|
||||
$query->whereBetween('created_at',
|
||||
[Carbon::parse($request->start)->startOfDay(), Carbon::parse($request->end)->endOfDay()]);
|
||||
})
|
||||
->when($request->start, function ($query) use ($request) {
|
||||
$query->where('updated_at', '>', $request->start);
|
||||
$query->where('created_at', '>', Carbon::parse($request->start)->startOfDay());
|
||||
})
|
||||
->when($request->end, function ($query) use ($request) {
|
||||
$query->where('updated_at', '<', $request->end);
|
||||
$query->where('created_at', '<', Carbon::parse($request->end)->endOfDay());
|
||||
})
|
||||
->latest()
|
||||
->chunk(5000, function ($coupons) use ($handle) {
|
||||
|
||||
Reference in New Issue
Block a user