Merge branch 'coupon_report'

app/Admin/Controllers/CouponSettingController.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Repositories\CouponSetting;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Controllers\AdminController;
+
+class CouponSettingController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new CouponSetting(), function (Grid $grid) {
+            $grid->id->sortable();
+            $grid->name;
+            $grid->category;
+            $grid->value;
+            $grid->desc;
+            $grid->sort;
+            $grid->status;
+            $grid->created_at;
+            $grid->updated_at->sortable();
+        
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->equal('id');
+        
+            });
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return Show::make($id, new CouponSetting(), function (Show $show) {
+            $show->id;
+            $show->name;
+            $show->category;
+            $show->value;
+            $show->desc;
+            $show->sort;
+            $show->status;
+            $show->created_at;
+            $show->updated_at;
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new CouponSetting(), function (Form $form) {
+            $form->display('id');
+            $form->text('name');
+            $form->text('category');
+            $form->text('value');
+            $form->text('desc');
+            $form->text('sort');
+            $form->text('status');
+        
+            $form->display('created_at');
+            $form->display('updated_at');
+        });
+    }
+}

app/Admin/Repositories/CouponSetting.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Admin\Repositories;
+
+use App\Models\CouponSetting as Model;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class CouponSetting extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+}

app/Console/Commands/couponReport.php

@@ -72,11 +72,12 @@ class couponReport extends Command
                         ,discounts as 优惠金额
                         ,inventory AS 发放数量
                         ,inventory_use as 已领取数量
-                        ,IFNULL((SELECT SUM(IFNULL(number,0)) FROM ims_system_coupon_user_use WHERE system_coupon_id = coupon.id AND TO_DAYS(receive.created_at) = TO_DAYS(NOW())),0) AS 使用数量
+                        ,IFNULL((SELECT SUM(IFNULL(number,0)) FROM ims_system_coupon_user_use WHERE system_coupon_id = coupon.id AND TO_DAYS(use_time) = TO_DAYS(NOW())),0) AS 使用数量
                     FROM
                         ims_system_coupon_user coupon
                     LEFT JOIN ims_system_coupon_user_receive receive ON coupon.id = receive.system_coupon_user_id
-                    WHERE receive.created_at BETWEEN ? AND ?",
+                    WHERE receive.created_at BETWEEN ? AND ? 
+                    GROUP BY coupon.id",
                     $where
                 );
         // 查询优惠券订单用户数据
@@ -113,7 +114,7 @@ class couponReport extends Command
         //     $listArray[] = (array)$value;
         // }
         if($return){
-            return json_encode(compact($orderTotal,$receiveCoupon,$orderList));
+            // return json_encode(compact($orderTotal,$receiveCoupon,$orderList));
         }else{
             $this->table(['优惠券标题','使用优惠券消费总额(实付总金额)','订单总额(不包含配送费，含包装费)','配送费','优惠总金额','总订单数量'],$orderArray);
             $this->table(['ID','优惠券标题','满足金额','优惠金额','发放数量','已领取数量','使用数量'],$receiveArray);

app/Models/CouponSetting.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Models;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Model;
+
+class CouponSetting extends Model
+{
+	use HasDateTimeFormatter;
+    use SoftDeletes;
+
+    protected $table = 'ims_system_coupon_setting';
+    
+}

resources/lang/zh-CN/coupon-setting.php

@@ -0,0 +1,16 @@
+<?php 
+return [
+    'labels' => [
+        'CouponSetting' => 'CouponSetting',
+    ],
+    'fields' => [
+        'name' => '名称',
+        'category' => '分类',
+        'value' => '值',
+        'desc' => '描述',
+        'sort' => '排序',
+        'status' => '状态',
+    ],
+    'options' => [
+    ],
+];