From b579dc6e771660202581a2fe16f729a22e356a1f Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Wed, 29 Jul 2020 15:54:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/form/Goods.php              | 72 +++++++++----------
 .../admin/view/default/site/attachment.html   | 21 +++++-
 application/admin/view/default/site/base.html | 11 ++-
 .../admin/view/default/site/verify.html       | 14 +++-
 application/api/controller/Devtest.php        | 23 ++++++
 application/service/BuyService.php            |  5 ++
 6 files changed, 102 insertions(+), 44 deletions(-)

diff --git a/application/admin/form/Goods.php b/application/admin/form/Goods.php
index 2e3f8c808..b931694fd 100644
--- a/application/admin/form/Goods.php
+++ b/application/admin/form/Goods.php
@@ -86,18 +86,30 @@ class Goods
                     ],
                 ],
                 [
-                    'label'         => '商品类型',
+                    'label'         => '商品分类',
                     'view_type'     => 'field',
-                    'view_key'      => 'site_type',
-                    'view_data_key' => 'name',
-                    'view_data'     => lang('common_site_type_list'),
+                    'view_key'      => 'category_text',
                     'search_config' => [
-                        'form_type'         => 'select',
-                        'where_type'        => 'in',
-                        'data'              => lang('common_site_type_list'),
-                        'data_key'          => 'value',
+                        'form_type'             => 'module',
+                        'template'              => 'lib/module/goods_category',
+                        'form_name'             => 'id',
+                        'where_type'            => 'in',
+                        'where_handle_custom'   => 'WhereValueGoodsCategory',
+                        'data'                  => GoodsService::GoodsCategoryAll(),
+                    ],
+                ],
+                [
+                    'label'         => '品牌',
+                    'view_type'     => 'field',
+                    'view_key'      => 'brand_name',
+                    'search_config' => [
+                        'form_type'         => 'module',
+                        'template'          => 'lib/module/category_brand',
+                        'form_name'         => 'brand_id',
+                        'data'              => BrandService::CategoryBrand(),
+                        'data_key'          => 'id',
                         'data_name'         => 'name',
-                        'is_multiple'       => 1,
+                        'where_type'        => 'in',
                     ],
                 ],
                 [
@@ -176,6 +188,21 @@ class Goods
                         'is_multiple'       => 1,
                     ],
                 ],
+                [
+                    'label'         => '商品类型',
+                    'view_type'     => 'field',
+                    'view_key'      => 'site_type',
+                    'view_data_key' => 'name',
+                    'view_data'     => lang('common_site_type_list'),
+                    'search_config' => [
+                        'form_type'         => 'select',
+                        'where_type'        => 'in',
+                        'data'              => lang('common_site_type_list'),
+                        'data_key'          => 'value',
+                        'data_name'         => 'name',
+                        'is_multiple'       => 1,
+                    ],
+                ],
                 [
                     'label'         => '商品型号',
                     'view_type'     => 'field',
@@ -185,33 +212,6 @@ class Goods
                         'where_type'        => 'like',
                     ],
                 ],
-                [
-                    'label'         => '商品分类',
-                    'view_type'     => 'field',
-                    'view_key'      => 'category_text',
-                    'search_config' => [
-                        'form_type'             => 'module',
-                        'template'              => 'lib/module/goods_category',
-                        'form_name'             => 'id',
-                        'where_type'            => 'in',
-                        'where_handle_custom'   => 'WhereValueGoodsCategory',
-                        'data'                  => GoodsService::GoodsCategoryAll(),
-                    ],
-                ],
-                [
-                    'label'         => '品牌',
-                    'view_type'     => 'field',
-                    'view_key'      => 'brand_name',
-                    'search_config' => [
-                        'form_type'         => 'module',
-                        'template'          => 'lib/module/category_brand',
-                        'form_name'         => 'brand_id',
-                        'data'              => BrandService::CategoryBrand(),
-                        'data_key'          => 'id',
-                        'data_name'         => 'name',
-                        'where_type'        => 'in',
-                    ],
-                ],
                 [
                     'label'         => '生产地',
                     'view_type'     => 'field',
diff --git a/application/admin/view/default/site/attachment.html b/application/admin/view/default/site/attachment.html
index 43e3a0fdc..e857ecbe6 100644
--- a/application/admin/view/default/site/attachment.html
+++ b/application/admin/view/default/site/attachment.html
@@ -11,15 +11,30 @@
         <form class="am-form form-validation view-save" action="{{:MyUrl('admin/site/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/site/index', ['nav_type'=>'attachment'])}}" enctype="multipart/form-data">
             <div class="am-form-group">
                 <label>{{$data.home_max_limit_image.name}}<span class="am-form-group-label-tips">{{$data.home_max_limit_image.describe}}</span></label>
-                <input type="number" name="{{$data.home_max_limit_image.only_tag}}" placeholder="{{$data.home_max_limit_image.name}}" data-validation-message="{{$data.home_max_limit_image.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_max_limit_image.value}}"{{/if}} required />
+                <div class="am-input-group am-input-group-sm">
+                    <input type="number" min="0" name="{{$data.home_max_limit_image.only_tag}}" placeholder="{{$data.home_max_limit_image.name}}" data-validation-message="{{$data.home_max_limit_image.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_max_limit_image.value}}"{{/if}} />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default" type="button">B</button>
+                  </span>
+                </div>
             </div>
             <div class="am-form-group">
                 <label>{{$data.home_max_limit_file.name}}<span class="am-form-group-label-tips">{{$data.home_max_limit_file.describe}}</span></label>
-                <input type="number" name="{{$data.home_max_limit_file.only_tag}}" placeholder="{{$data.home_max_limit_file.name}}" data-validation-message="{{$data.home_max_limit_file.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_max_limit_file.value}}"{{/if}} required />
+                <div class="am-input-group am-input-group-sm">
+                    <input type="number" min="0" name="{{$data.home_max_limit_file.only_tag}}" placeholder="{{$data.home_max_limit_file.name}}" data-validation-message="{{$data.home_max_limit_file.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_max_limit_file.value}}"{{/if}} />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default" type="button">B</button>
+                  </span>
+                </div>
             </div>
             <div class="am-form-group">
                 <label>{{$data.home_max_limit_video.name}}<span class="am-form-group-label-tips">{{$data.home_max_limit_video.describe}}</span></label>
-                <input type="number" name="{{$data.home_max_limit_video.only_tag}}" placeholder="{{$data.home_max_limit_video.name}}" data-validation-message="{{$data.home_max_limit_video.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_max_limit_video.value}}"{{/if}} required />
+                <div class="am-input-group am-input-group-sm">
+                    <input type="number" min="0" name="{{$data.home_max_limit_video.only_tag}}" placeholder="{{$data.home_max_limit_video.name}}" data-validation-message="{{$data.home_max_limit_video.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_max_limit_video.value}}"{{/if}} />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default" type="button">B</button>
+                  </span>
+                </div>
             </div>
             
             <div class="am-form-group am-form-group-refreshing">
diff --git a/application/admin/view/default/site/base.html b/application/admin/view/default/site/base.html
index ae47d8885..08bac2a13 100755
--- a/application/admin/view/default/site/base.html
+++ b/application/admin/view/default/site/base.html
@@ -75,9 +75,14 @@
 			</div>
 
 			<div class="am-form-group">
-				<label>{{$data.home_content_max_width.name}}<span class="am-form-group-label-tips">{{$data.home_content_max_width.describe}}</span></label>
-				<input type="number" name="{{$data.home_content_max_width.only_tag}}" placeholder="{{$data.home_content_max_width.name}}" data-validation-message="{{$data.home_content_max_width.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_content_max_width.value}}"{{/if}} required />
-			</div>
+                <label>{{$data.home_content_max_width.name}}<span class="am-form-group-label-tips">{{$data.home_content_max_width.describe}}</span></label>
+                <div class="am-input-group am-input-group-sm">
+                    <input type="number" min="0" name="{{$data.home_content_max_width.only_tag}}" placeholder="{{$data.home_content_max_width.name}}" data-validation-message="{{$data.home_content_max_width.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_content_max_width.value}}"{{/if}} />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default" type="button">px</button>
+                  </span>
+                </div>
+            </div>
 			<div class="am-form-group">
 				<label>{{$data.home_static_cache_version.name}}<span class="am-form-group-label-tips">{{$data.home_static_cache_version.describe}}</span></label>
 				<input type="text" name="{{$data.home_static_cache_version.only_tag}}" placeholder="{{$data.home_static_cache_version.describe}}" data-validation-message="{{$data.home_static_cache_version.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_static_cache_version.value}}"{{/if}} />
diff --git a/application/admin/view/default/site/verify.html b/application/admin/view/default/site/verify.html
index a98bb08ef..e773359ba 100644
--- a/application/admin/view/default/site/verify.html
+++ b/application/admin/view/default/site/verify.html
@@ -11,11 +11,21 @@
         <form class="am-form form-validation view-save" action="{{:MyUrl('admin/site/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/site/index', ['nav_type'=>'verify'])}}" enctype="multipart/form-data">
             <div class="am-form-group">
                 <label>{{$data.common_verify_expire_time.name}}<span class="am-form-group-label-tips">{{$data.common_verify_expire_time.describe}}</span></label>
-                <input type="number" name="{{$data.common_verify_expire_time.only_tag}}" placeholder="{{$data.common_verify_expire_time.name}}" data-validation-message="{{$data.common_verify_expire_time.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_verify_expire_time.value}}"{{/if}} required />
+                <div class="am-input-group am-input-group-sm">
+                    <input type="number" min="0" name="{{$data.common_verify_expire_time.only_tag}}" placeholder="{{$data.common_verify_expire_time.name}}" data-validation-message="{{$data.common_verify_expire_time.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_verify_expire_time.value}}"{{/if}} />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default" type="button">秒</button>
+                  </span>
+                </div>
             </div>
             <div class="am-form-group">
                 <label>{{$data.common_verify_interval_time.name}}<span class="am-form-group-label-tips">{{$data.common_verify_interval_time.describe}}</span></label>
-                <input type="number" name="{{$data.common_verify_interval_time.only_tag}}" placeholder="{{$data.common_verify_interval_time.name}}" data-validation-message="{{$data.common_verify_interval_time.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_verify_interval_time.value}}"{{/if}} required />
+                <div class="am-input-group am-input-group-sm">
+                    <input type="number" min="0" name="{{$data.common_verify_interval_time.only_tag}}" placeholder="{{$data.common_verify_interval_time.name}}" data-validation-message="{{$data.common_verify_interval_time.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_verify_interval_time.value}}"{{/if}} />
+                    <span class="am-input-group-btn">
+                        <button class="am-btn am-btn-default" type="button">秒</button>
+                  </span>
+                </div>
             </div>
             <div class="am-form-group">
                 <label>{{$data.home_img_verify_state.name}}<span class="am-form-group-label-tips">{{$data.home_img_verify_state.describe}}</span></label>
diff --git a/application/api/controller/Devtest.php b/application/api/controller/Devtest.php
index ca8a83f2f..347089fc2 100644
--- a/application/api/controller/Devtest.php
+++ b/application/api/controller/Devtest.php
@@ -131,6 +131,29 @@ class Devtest extends Common
         echo 'count:'.count($result).', success:'.$success.', fail:'.$fail;
     }
 
+    /**
+     * 商品库存初始化
+     * @author  Devil
+     * @blog    http://gong.gg/
+     * @version 1.0.0
+     * @date    2020-07-29
+     * @desc    description
+     */
+    public function GoodsInventoryHandle()
+    {
+        $warehouse_id = 1;
+        $warehouse = Db::name('Warehouse')->where(['id'=>$warehouse_id])->find();
+        if(empty($warehouse))
+        {
+            $data = [
+                'name'          => '默认仓库',
+                'is_default'    => 1,
+                'add_time'      => time(),
+            ];
+            $warehouse_id = Db::name('Warehouse')->insertGetId($data);
+        }
+    }
+
     /**
      * 支付日志处理
      * @author  Devil
diff --git a/application/service/BuyService.php b/application/service/BuyService.php
index 82847e9ea..850a10c39 100755
--- a/application/service/BuyService.php
+++ b/application/service/BuyService.php
@@ -272,6 +272,11 @@ class BuyService
                     $v['is_error'] = 1;
                     $v['error_msg'] = '商品已下架';
                 }
+                if(empty($v['error_msg']) && $v['inventory'] <= 0)
+                {
+                    $v['is_error'] = 1;
+                    $v['error_msg'] = '商品卖没货了';
+                }
                 $ret = GoodsService::IsGoodsSiteTypeConsistent($v['goods_id'], $v['site_type']);
                 if(empty($v['error_msg']) && $ret['code'] != 0)
                 {