Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

crmeb/app/adminapi/route/product.php

@@ -15,6 +15,7 @@ Route::group('product', function () {
     Route::get('category', 'v1.product.StoreCategory/index')->option(['real_name' => '商品分类列表']);
     //商品树形列表
     Route::get('category/tree/:type', 'v1.product.StoreCategory/tree_list')->option(['real_name' => '商品分类树形列表']);
+    Route::get('category/cascader/:type', 'v1.product.StoreCategory/cascader_list')->option(['real_name' => '商品分类树形列表']);
     //商品分类新增表单
     Route::get('category/create', 'v1.product.StoreCategory/create')->option(['real_name' => '商品分类新增表单']);
     //商品分类新增

crmeb/app/api/controller/v1/PublicController.php

@@ -657,4 +657,31 @@ class PublicController
     {
         return app('json')->success(app()->make(LangCodeServices::class)->getLangVersion());
     }
+
+    /**
+     * 商城基础配置汇总接口
+     * @return \think\Response
+     * @author 吴汐
+     * @email 442384644@qq.com
+     * @date 2023/04/03
+     */
+    public function getMallBasicConfig()
+    {
+        $data['site_name'] = sys_config('site_name');//网站名称
+        $data['site_url'] = sys_config('site_url');//网站地址
+        $data['wap_login_logo'] = sys_config('wap_login_logo');//移动端登录logo
+        $data['wap_login_logo'] = sys_config('wap_login_logo');//移动端登录logo
+        $data['record_No'] = sys_config('record_No');//备案号
+        $data['network_security'] = sys_config('network_security');//网安备案
+        $data['store_self_mention'] = sys_config('store_self_mention');//是否开启到店自提
+        $data['invoice_func_status'] = sys_config('invoice_func_status');//发票功能启用
+        $data['special_invoice_status'] = sys_config('special_invoice_status');//专用发票启用
+        $data['member_func_status'] = sys_config('member_func_status');//用户等级启用
+        $data['balance_func_status'] = sys_config('balance_func_status');//余额功能启用
+        $data['recharge_switch'] = sys_config('recharge_switch');//小程序充值开关
+        $data['member_card_status'] = sys_config('member_card_status');//是否开启付费会员
+        $data['member_price_status'] = sys_config('member_price_status');//商品会员折扣价展示启用
+
+        return app('json')->success($data);
+    }
 }

crmeb/app/dao/BaseDao.php

@@ -310,7 +310,7 @@ abstract class BaseDao
             if ($responses->hasMethod($method)) {
                 $with[] = $key;
             } else {
-                if ($key != 'timeKey') {
+                if (!in_array($key, ['timeKey', 'store_stock','start_status'])) {
                     $otherWhere[] = is_array($value) ? $value : [$key, '=', $value];
                 }
             }

crmeb/app/dao/product/product/StoreCategoryDao.php

@@ -45,7 +45,9 @@ class StoreCategoryDao extends BaseDao
     /**
      *
      * @param array $where
+     * @param array $field
      * @return array
+     * @throws \ReflectionException
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
@@ -59,6 +61,7 @@ class StoreCategoryDao extends BaseDao
      * 添加修改选择上级分类列表
      * @param array $where
      * @return array
+     * @throws \ReflectionException
      */
     public function getMenus(array $where)
     {

crmeb/app/model/product/product/StoreProduct.php

@@ -326,8 +326,6 @@ class StoreProduct extends BaseModel
                     $query->whereIn('id', function ($query) use ($store_stock) {
                         $query->name('store_product_attr_value')->where('stock', '<', $store_stock)->where('stock', '>', 0)->where('type', 0)->field('product_id')->select();
                     });
-//                    $query->where(['is_show' => 1, 'is_del' => 0])->where('stock', '<=', $store_stock)->where('stock', '>', 0);
-
                 } else {
                     $query->where(['is_show' => 1, 'is_del' => 0])->where('stock', '>', 0);
                 }

crmeb/public/install/crmeb.sql

@@ -33347,7 +33347,7 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config
 (19, 'wechat_qrcode', 'upload', 'input', 2, '', 1, '', 0, 0, '\"\"', '公众号关注二维码', '引导关注公众号显示的公众号关注二维码', 76, 1),
 (21, 'wechat_share_title', 'text', 'input', 70, '', 0, 'required:true', 100, 0, '\"CRMEB v4\\u6807\\u51c6\\u7248\"', '微信分享标题', '微信分享标题', 0, 1),
 (22, 'wechat_share_synopsis', 'textarea', '', 70, '', 0, '', 100, 5, '\"\\u5b8c\\u5584\\u7684\\u6587\\u6863 \\u5168\\u201c\\u5fc3\\u201d\\u800c\\u6765\\uff01\"', '微信分享简介', '微信分享简介', 0, 1),
-(25, 'pay_weixin_mchid', 'text', 'input', 4, '', 0, '', 100, 0, '\"\"', 'Mchid', '受理商ID，身份标识', 0, 1),
+(25, 'pay_weixin_mchid', 'text', 'input', 4, '', 0, '', 100, 0, '\"\"', 'Mchid', '微信商户商户号，微信商户商户号', 0, 1),
 (26, 'pay_weixin_client_cert', 'upload', 'input', 4, '', 3, '', 0, 0, '\"\"', '微信支付证书', '微信支付证书，在微信商家平台中可以下载！文件名一般为apiclient_cert.pem', 0, 1),
 (27, 'pay_weixin_client_key', 'upload', 'input', 4, '', 3, '', 0, 0, '\"\"', '微信支付证书密钥', '微信支付证书密钥，在微信商家平台中可以下载！文件名一般为apiclient_key.pem', 0, 1),
 (28, 'pay_weixin_key', 'text', 'input', 4, '', 0, '', 100, 0, '\"\"', 'Key', '商户支付密钥Key。审核通过后，在微信发送的邮件中查看。', 0, 1),