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

测试

Browse Source
This commit is contained in:
徐永宾
2022-01-20 10:35:30 +08:00
parent a1be07fe91
commit 3c532e312e
1 changed files with 170 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/Merchant/Controllers/Coupon/IndexController.php
View File

@@ -6,6 +6,7 @@ use App\Merchant\Controllers\Controller;
use App\Models\ActivityRule; use App\Models\ActivityRule;
use App\Models\Coupon; use App\Models\Coupon;
use Auth; use Auth;
use Carbon\Carbon;
use Illuminate\Http\Request; use Illuminate\Http\Request;
class IndexController extends Controller class IndexController extends Controller
@@ -19,11 +20,11 @@ class IndexController extends Controller
if ($action == 'search') { if ($action == 'search') {
$rules = ActivityRule::get(); $rules = ActivityRule::get();
if ($request->start) { if ($request->start) {
$request->start = $request->start . ' 00:00:00'; $request->start = $request->start.' 00:00:00';
} }
if ($request->end) { if ($request->end) {
$request->end = $request->end . ' 23:59:59'; $request->end = $request->end.' 23:59:59';
} }
$outlet = $request->outlet; $outlet = $request->outlet;
@@ -61,10 +62,10 @@ class IndexController extends Controller
->when($start && $end, function ($query) use ($start, $end) { ->when($start && $end, function ($query) use ($start, $end) {
$query->whereBetween('created_at', [$start, $end]); $query->whereBetween('created_at', [$start, $end]);
}) })
->when($start && !$end, function ($query) use ($start) { ->when($start && ! $end, function ($query) use ($start) {
$query->where('created_at', '>', $start); $query->where('created_at', '>', $start);
}) })
->when(!$start && $end, function ($query) use ($end) { ->when(! $start && $end, function ($query) use ($end) {
$query->where('created_at', '<', $end); $query->where('created_at', '<', $end);
}) })
->orderBy('created_at', 'desc')->orderBy('id', 'desc')->paginate(); ->orderBy('created_at', 'desc')->orderBy('id', 'desc')->paginate();
@@ -84,9 +85,10 @@ class IndexController extends Controller
/** /**
* 按照日期分润 * 按照日期分润
* @author 玄尘 2020-03-11 *
* @param Request $request [description] * @param Request $request [description]
* @return array|\Illuminate\Contracts\View\Factory|\Illuminate\View\View * @return array|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @author 玄尘 2020-03-11
*/ */
public function profits(Request $request) public function profits(Request $request)
{ {
@@ -115,9 +117,10 @@ class IndexController extends Controller
/** /**
* 分润 * 分润
* @author 玄尘 2020-03-11 *
* @param Coupon $coupon [description] * @param Coupon $coupon [description]
* @return [type] [description] * @return [type] [description]
* @author 玄尘 2020-03-11
*/ */
public function profit(Coupon $coupon) public function profit(Coupon $coupon)
{ {
@@ -238,12 +241,12 @@ class IndexController extends Controller
//导出数据 //导出数据
public function excel($request, $user) public function excel($request, $user)
{ {
if (!$request->end) { if (! $request->end) {
$request->end = now()->toDateTimeString(); $request->end = now()->toDateTimeString();
} }
set_time_limit(0); set_time_limit(0);
ini_set('memory_limit', '1024M'); ini_set('memory_limit', '1024M');
$filename = '卡券记录' . date('YmdHis') . '.csv'; $filename = '卡券记录'.date('YmdHis').'.csv';
$response = function () use ($user, $request) { $response = function () use ($user, $request) {
$handle = fopen('php://output', 'w'); $handle = fopen('php://output', 'w');
$titles = ['ID', '网点名称', '平安券编号', '优惠政策', '核销金额', '订单id', '状态', '处理结果', '核销时间']; $titles = ['ID', '网点名称', '平安券编号', '优惠政策', '核销金额', '订单id', '状态', '处理结果', '核销时间'];
@@ -269,23 +272,24 @@ class IndexController extends Controller
$query->whereIn('status', [2, 3]); $query->whereIn('status', [2, 3]);
}) })
->when($request->start && $request->end, function ($query) use ($request) { ->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) { ->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) { ->when($request->end, function ($query) use ($request) {
$query->where('updated_at', '<', $request->end); $query->where('created_at', '<', Carbon::parse($request->end)->endOfDay());
}) })
->latest() ->latest()
->chunk(5000, function ($coupons) use ($handle) { ->chunk(5000, function ($coupons) use ($handle) {
foreach ($coupons as $index => $info) { foreach ($coupons as $index => $info) {
fputcsv($handle, [ fputcsv($handle, [
$info->id, $info->id,
$info->outlet ? $info->outlet->nickname : 'Id:' . $info->outletId, $info->outlet ? $info->outlet->nickname : 'Id:'.$info->outletId,
$info->redemptionCode . "\t", $info->redemptionCode."\t",
' ' . $info->couponName, ' '.$info->couponName,
$info->price . "\t", $info->price."\t",
$info->orderid, $info->orderid,
$info->status_text, $info->status_text,
$info->remark, $info->remark,