Kaynağa Gözat

Merge branch 'develop'

xielin 6 yıl önce
ebeveyn
işleme
1e9729398e

+ 12 - 1
app/Http/Controllers/V1/AuthController.php

@@ -70,7 +70,18 @@ class AuthController extends Controller {
             return $this->response->error('登陆失败', 500);
         }else{
             $shopAccount = Auth::user();
-            $factory = JWTFactory::customClaims(['shop'=>['uid'=>$shopAccount->id,'username'=>$shopAccount->account,'shop_id'=>$shopAccount->shop_id,'sign'=>md5($shopAccount->id).config('customer.jwt_secret')],'type'=>2]);
+            $factory = JWTFactory::customClaims(
+                [
+                    'shop'=>[
+                        'uid'=>$shopAccount->id,
+                        'username'=>$shopAccount->account,
+                        'shop_id'=>$shopAccount->shop_id,
+                        'shop_name'=>$shop->shop_name,
+                        'sign'=>md5($shopAccount->id).config('customer.jwt_secret')
+                    ],
+                        'type'=>2
+                    ]
+            );
             $payload = $factory->make();
             $token = JWTAuth::encode($payload);
             $shopAccount->token = $token;

+ 11 - 2
app/Http/Controllers/V1/IndexController.php

@@ -6,6 +6,7 @@ use App\Repositories\StatisticsRepository;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Tymon\JWTAuth\Facades\JWTAuth;
 
 class IndexController extends Controller
 {
@@ -20,9 +21,14 @@ class IndexController extends Controller
      */
     public function index(Request $request)
     {
+       // $shopId = 1;
+        $token =  JWTAuth::decode(JWTAuth::getToken());
+        if($token['type'] == 2){
+            $shopId = $token['shop']->shop_id;
+        }
 //        $user = Auth::user();
 //        $shopId = $user->shop_id;
-        $shopId = 1;
+ //       $shopId = 1;
         $request = $request->all();
         $start = Carbon::parse(isset($request['start']) ? $request['start'] : Carbon::now())->startOfDay()->format('Y-m-d\TH:i:s\Z');
         $end = Carbon::parse(isset($request['end']) ? $request['end'] : Carbon::now())->endOfDay()->format('Y-m-d\TH:i:s\Z');
@@ -44,7 +50,10 @@ class IndexController extends Controller
     {
 //        $user = Auth::user();
 //        $shopId = $user->shop_id;
-        $shopId = 1;
+        $token =  JWTAuth::decode(JWTAuth::getToken());
+        if($token['type'] == 2){
+            $shopId = $token['shop']->shop_id;
+        }
         $request = $request->all();
         $start = Carbon::parse(isset($request['start']) ? $request['start'] : '-6 days')->startOfDay()->format('Y-m-d\TH:i:s\Z');
         $end = Carbon::parse(isset($request['end']) ? $request['end'] : Carbon::now())->endOfDay()->format('Y-m-d\TH:i:s\Z');

+ 2 - 2
app/Http/Controllers/V1/ShopController.php

@@ -52,7 +52,7 @@ class ShopController extends Controller {
             'license_img' => 'required|string',
             'food_trans_license' => 'required|string',
             'other_license' => 'string',
-            'proportion'=>'required|digits_between:1,100|integer',
+            'proportion'=>'required|digits_between:0,100',
             'verify_type'=>['required',Rule::in([0,1])],
             'account'=>'string|max:20',
             'password'=>'string|min:6|max:18',
@@ -148,7 +148,7 @@ class ShopController extends Controller {
         $resource->setPaginator(new IlluminatePaginatorAdapter($shops));
         $data = $fractal->createData($resource)->toArray();
         $data['extra']['filters'] = ['shop_name','status'];
-        $data['extra']['columns'] = ['shop_id','shop_name','mobile','province_name','city_name','product_count','proportion','status'];
+        $data['extra']['columns'] = ['shop_id','shop_name','mobile','province_name','city_name','proportion','status'];
         return $data;
     }
 

+ 0 - 6
app/Repositories/StatisticsRepository.php

@@ -406,13 +406,7 @@ class StatisticsRepository
                     "sale_per_day" => [
                         "date_histogram" => [
                             "field" => "created_at",
-                            "time_zone" => "Asia/Shanghai",
                             "interval" => "1d",
-//                            "offset" => 0,
-//                            "order" => [
-//                                "_key" => "asc"
-//                            ],
-//                            "keyed" => false,
                             "min_doc_count" => 0,
                             "format" => "yyyy-MM-dd",
                             "extended_bounds" => [

+ 190 - 0
resources/lang/zh-CN/validation.php

@@ -0,0 +1,190 @@
+<?php
+
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | as the size rules. Feel free to tweak each of these messages.
+    |
+    */
+
+    'accepted' => ':attribute 必须接受。',
+    'active_url' => ':attribute 不是一个有效的网址。',
+    'after' => ':attribute 必须要晚于 :date。',
+    'after_or_equal' => ':attribute 必须要等于 :date 或更晚。',
+    'alpha' => ':attribute 只能由字母组成。',
+    'alpha_dash' => ':attribute 只能由字母、数字和斜杠组成。',
+    'alpha_num' => ':attribute 只能由字母和数字组成。',
+    'array' => ':attribute 必须是一个数组。',
+    'before' => ':attribute 必须要早于 :date。',
+    'before_or_equal' => ':attribute 必须要等于 :date 或更早。',
+    'between' => [
+        'numeric' => ':attribute 必须介于 :min - :max 之间。',
+        'file' => ':attribute 必须介于 :min - :max kb 之间。',
+        'string' => ':attribute 必须介于 :min - :max 个字符之间。',
+        'array' => ':attribute 必须只有 :min - :max 个单元。',
+    ],
+    'boolean' => ':attribute 必须为布尔值。',
+    'confirmed' => ':attribute 两次输入不一致。',
+    'date' => ':attribute 不是一个有效的日期。',
+    'date_format' => ':attribute 的格式必须为 :format。',
+    'different' => ':attribute 和 :other 必须不同。',
+    'digits' => ':attribute 必须是 :digits 位的数字。',
+    'digits_between' => ':attribute 必须是介于 :min 和 :max 位的数字。',
+    'dimensions' => ':attribute 图片尺寸不正确。',
+    'distinct' => ':attribute 已经存在。',
+    'email' => ':attribute 不是一个合法的邮箱。',
+    'exists' => ':attribute 不存在。',
+    'file' => ':attribute 必须是文件。',
+    'filled' => ':attribute 不能为空。',
+    'image' => ':attribute 必须是图片。',
+    'in' => '已选的属性 :attribute 非法。',
+    'in_array' => ':attribute 没有在 :other 中。',
+    'integer' => ':attribute 必须是整数。',
+    'ip' => ':attribute 必须是有效的 IP 地址。',
+    'ipv4' => ':attribute 必须是有效的 IPv4 地址。',
+    'ipv6' => ':attribute 必须是有效的 IPv6 地址。',
+    'json' => ':attribute 必须是正确的 JSON 格式。',
+    'max' => [
+        'numeric' => ':attribute 不能大于 :max。',
+        'file' => ':attribute 不能大于 :max kb。',
+        'string' => ':attribute 不能大于 :max 个字符。',
+        'array' => ':attribute 最多只有 :max 个单元。',
+    ],
+    'mimes' => ':attribute 必须是一个 :values 类型的文件。',
+    'mimetypes' => ':attribute 必须是一个 :values 类型的文件。',
+    'min' => [
+        'numeric' => ':attribute 必须大于等于 :min。',
+        'file' => ':attribute 大小不能小于 :min kb。',
+        'string' => ':attribute 至少为 :min 个字符。',
+        'array' => ':attribute 至少有 :min 个单元。',
+    ],
+    'not_in' => '已选的属性 :attribute 非法。',
+    'numeric' => ':attribute 必须是一个数字。',
+    'present' => ':attribute 必须存在。',
+    'regex' => ':attribute 格式不正确。',
+    'required' => ':attribute 不能为空。',
+    'required_if' => '当 :other 为 :value 时 :attribute 不能为空。',
+    'required_unless' => '当 :other 不为 :value 时 :attribute 不能为空。',
+    'required_with' => '当 :values 存在时 :attribute 不能为空。',
+    'required_with_all' => '当 :values 存在时 :attribute 不能为空。',
+    'required_without' => '当 :values 不存在时 :attribute 不能为空。',
+    'required_without_all' => '当 :values 都不存在时 :attribute 不能为空。',
+    'same' => ':attribute 和 :other 必须相同。',
+    'size' => [
+        'numeric' => ':attribute 大小必须为 :size。',
+        'file' => ':attribute 大小必须为 :size kb。',
+        'string' => ':attribute 必须是 :size 个字符。',
+        'array' => ':attribute 必须为 :size 个单元。',
+    ],
+    'string' => ':attribute 必须是一个字符串。',
+    'timezone' => ':attribute 必须是一个合法的时区值。',
+    'unique' => ':attribute 已经存在。',
+    'uploaded' => ':attribute 上传失败。',
+    'url' => ':attribute 格式不正确。',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention 'attribute.rule' to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => [
+        'attribute-name' => [
+            'rule-name' => 'custom-message',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of 'email'. This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => [
+        'name' => '名称',
+        'username' => '用户名',
+        'email' => '邮箱',
+        'first_name' => '名',
+        'last_name' => '姓',
+        'password' => '密码',
+        'password_confirmation' => '确认密码',
+        'city' => '城市',
+        'country' => '国家',
+        'address' => '地址',
+        'phone' => '电话',
+        'mobile' => '手机',
+        'age' => '年龄',
+        'sex' => '性别',
+        'gender' => '性别',
+        'day' => '天',
+        'month' => '月',
+        'year' => '年',
+        'hour' => '时',
+        'minute' => '分',
+        'second' => '秒',
+        'title' => '标题',
+        'content' => '内容',
+        'description' => '描述',
+        'excerpt' => '摘要',
+        'date' => '日期',
+        'time' => '时间',
+        'available' => '可用的',
+        'size' => '大小',
+        'product_id'=>'商品id',
+        'shop_id'=>'商户ID',
+        'shop_name'=>'商户名称',
+        'product_id',
+        'product_name'=>'商品名称',
+        'product_img'=>'商品图片',
+        'product_price'=>'商品价格',
+        'sku_id'=>'规格ID',
+        'sku_name'=>'规格名称',
+        'amount'=>'数量',
+        'is_select'=>'是否选中',
+        'city_id'=>'城市ID',
+        'city_name'=>'城市名称',
+        'deliver_type'=>'配送方式',
+        'username'=>'用户名',
+        'avatar'=>'头像',
+        'purchase_id'=>'订单ID',
+        'purchase_no'=>'订单编号',
+        'purchase_detail_id'=>'子订单ID',
+        'sale_name'=>'商品上架名称',
+        'category_name1'=>'一级分类名称',
+        'category_name2'=>'二级分类名称',
+        'category_name3'=>'三级分类名称',
+        'star'=>'评价星级',
+        'content'=>'内容',
+        'imgs'=>'图片',
+        'shop_short_name'=>'商家简称',
+        'province_name'=>'省份名称',
+        'province_id'=>'省份id',
+        'contact_mobile'=>'联系人电话',
+        'contact_name'=>'联系人名称',
+        'shop_desc'=>'商家介绍',
+        'status'=>'状态',
+        'logo_img'=>'商家log',
+        'license_img'=>'营业执照',
+        'food_trans_license'=>'食品流通许可证',
+        'proportion'=>'利润分成',
+        'verify_type'=>'商品审核方式',
+        'account'=>'商家账号',
+    ],
+
+    'mobile'    => '手机号码格式不正确。',
+];