From 403bb34b81a4c7a877b152a9048d9c53078ad82a Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 3 Apr 2023 15:23:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=89=E8=A3=85sql=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/public/install/crmeb.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql index c111a4aa5..885862001 100755 --- a/crmeb/public/install/crmeb.sql +++ b/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), From 092e52d9fd097a227714e050030c6b9b1389e566 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 3 Apr 2023 15:58:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8E=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/adminapi/route/product.php | 1 + crmeb/app/dao/BaseDao.php | 2 +- crmeb/app/model/product/product/StoreProduct.php | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/crmeb/app/adminapi/route/product.php b/crmeb/app/adminapi/route/product.php index 9ede94a54..d73d2a0b9 100644 --- a/crmeb/app/adminapi/route/product.php +++ b/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' => '商品分类新增表单']); //商品分类新增 diff --git a/crmeb/app/dao/BaseDao.php b/crmeb/app/dao/BaseDao.php index 8563bd493..684e0ca6b 100644 --- a/crmeb/app/dao/BaseDao.php +++ b/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'])) { $otherWhere[] = is_array($value) ? $value : [$key, '=', $value]; } } diff --git a/crmeb/app/model/product/product/StoreProduct.php b/crmeb/app/model/product/product/StoreProduct.php index 432a59843..36728afdc 100644 --- a/crmeb/app/model/product/product/StoreProduct.php +++ b/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); } From a2b331ea534251ec209289611f5fd08151d1f09a Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 3 Apr 2023 16:39:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/dao/BaseDao.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crmeb/app/dao/BaseDao.php b/crmeb/app/dao/BaseDao.php index 684e0ca6b..1c7fce6ba 100644 --- a/crmeb/app/dao/BaseDao.php +++ b/crmeb/app/dao/BaseDao.php @@ -310,7 +310,7 @@ abstract class BaseDao if ($responses->hasMethod($method)) { $with[] = $key; } else { - if (!in_array($key, ['timeKey', 'store_stock'])) { + if (!in_array($key, ['timeKey', 'store_stock','start_status'])) { $otherWhere[] = is_array($value) ? $value : [$key, '=', $value]; } } From 50ce0161b87b448fff30a1aad9d8213c77190ff9 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 3 Apr 2023 16:39:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/v1/PublicController.php | 27 +++++++++++++++++++ .../dao/product/product/StoreCategoryDao.php | 3 +++ 2 files changed, 30 insertions(+) diff --git a/crmeb/app/api/controller/v1/PublicController.php b/crmeb/app/api/controller/v1/PublicController.php index 7581def83..e820356b2 100644 --- a/crmeb/app/api/controller/v1/PublicController.php +++ b/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); + } } diff --git a/crmeb/app/dao/product/product/StoreCategoryDao.php b/crmeb/app/dao/product/product/StoreCategoryDao.php index 03bcbff59..cbe034902 100644 --- a/crmeb/app/dao/product/product/StoreCategoryDao.php +++ b/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) {