From 82b2169c054626c7ddd86816f68d93cb734bb2d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com> Date: Fri, 10 Feb 2023 14:53:32 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E3=80=91=E6=9B=B4=E6=96=B0=E5=BC=80=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/common.php | 52 ++++++++++++------- crmeb/app/model/system/SystemMenus.php | 2 +- crmeb/app/services/other/UploadService.php | 4 +- .../system/config/SystemConfigServices.php | 41 +++++---------- .../system/config/SystemStorageServices.php | 14 ++++- .../system/lang/LangCountryServices.php | 2 + .../services/system/lang/LangTypeServices.php | 16 +++++- crmeb/app/services/user/LoginServices.php | 2 +- .../app/services/user/UserInvoiceServices.php | 2 +- crmeb/app/services/user/UserServices.php | 14 ++--- crmeb/public/install/crmeb.sql | 31 ++++++----- 11 files changed, 103 insertions(+), 77 deletions(-) diff --git a/crmeb/app/common.php b/crmeb/app/common.php index 619450f9d..6b1f6116c 100644 --- a/crmeb/app/common.php +++ b/crmeb/app/common.php @@ -26,27 +26,33 @@ use think\facade\Config; if (!function_exists('get_pay_type')) { /** + * @param string $payType + * @return string * @author 等风来 * @email 136327134@qq.com * @date 2023/2/9 - * @param string $paytype - * @return string */ - function get_pay_type(string $paytype) + function get_pay_type(string $payType) { - $wechatPay = (int)sys_config('pay_weixin_open') == 1; $allinPay = (int)sys_config('allin_pay_status') == 1; + //微信支付没有开启，通联支付开启，用户访问端在小程序或者公众号的时候，使用通联微信H5支付 - if ($paytype == PayServices::WEIXIN_PAY && !$wechatPay && $allinPay && (request()->isRoutine() || request()->isWechat())) { - $paytype = PayServices::ALLIN_PAY; + if ($payType == PayServices::WEIXIN_PAY) { + $wechat_pay_type = (int)sys_config('wechat_pay_type', 0); + if ($wechat_pay_type == 1 && $allinPay && (request()->isRoutine() || request()->isWechat())) { + $payType = PayServices::ALLIN_PAY; + } } - $aliPay = (bool)sys_config('ali_pay_status'); //支付宝没有开启，通联支付开了，用户使用支付宝支付，并且在app端访问的时候，使用通联app支付宝支付 - if (!$aliPay && $paytype == PayServices::ALIAPY_PAY && request()->isApp()) { - $paytype = PayServices::ALLIN_PAY; + if ($payType == PayServices::ALIAPY_PAY) { + $alipay_pay_type = (int)sys_config('alipay_pay_type', 0); + if ($alipay_pay_type == 1 && $allinPay && request()->isApp()) { + $payType = PayServices::ALLIN_PAY; + } } - return $paytype; + + return $payType; } } @@ -59,17 +65,17 @@ if (!function_exists('is_wechat_pay')) { */ function is_wecaht_pay() { + $wechat_pay_type = (int)sys_config('wechat_pay_type', 0); $wechatPay = (int)sys_config('pay_weixin_open') == 1; $allinPay = (int)sys_config('allin_pay_status') == 1; - if ($wechatPay) { + if ($wechat_pay_type == 0 && $wechatPay) { return true; - } else { - if ((request()->isRoutine() || request()->isWechat()) && $allinPay) { + } elseif ($wechat_pay_type == 1 && $allinPay) { + if ((request()->isRoutine() || request()->isWechat())) { return true; } } - return false; } } @@ -83,13 +89,14 @@ if (!function_exists('is_ali_pay')) { */ function is_ali_pay() { - $aliPay = (bool)sys_config('ali_pay_status'); + $alipay_pay_type = (int)sys_config('alipay_pay_type', 0); + $aliPay = (int)sys_config('ali_pay_status') == 1; $allinPay = (int)sys_config('allin_pay_status') == 1; - if ($aliPay) { + if ($alipay_pay_type == 0 && $aliPay) { return true; - } else { - if (request()->isApp() && $allinPay) { + } elseif ($alipay_pay_type == 1 && $allinPay) { + if (request()->isApp()) { return true; } } @@ -1007,7 +1014,10 @@ if (!function_exists('getLang')) { //获取接口传入的语言类型 if (!$range = $request->header('cb-lang')) { //没有传入则使用系统默认语言显示 - if (!$range = $langTypeServices->value(['is_default' => 1], 'file_name')) { + $range = $langTypeServices->cacheDriver()->remember('range_name', function () use ($langTypeServices) { + return $langTypeServices->value(['is_default' => 1], 'file_name'); + }); + if (!$range) { //系统没有设置默认语言的话，根据浏览器语言显示，如果浏览器语言在库中找不到，则使用简体中文 if ($request->header('accept-language') !== null) { $range = explode(',', $request->header('accept-language'))[0]; @@ -1018,7 +1028,9 @@ if (!function_exists('getLang')) { } // 获取type_id - $typeId = $langCountryServices->value(['code' => $range], 'type_id') ?: 1; + $typeId = $langCountryServices->cacheDriver()->remember('type_id_' . $range, function () use ($langCountryServices, $range) { + return $langCountryServices->value(['code' => $range], 'type_id') ?: 1; + }, 3600); // 获取类型 $langData = CacheService::remember('lang_type_data', function () use ($langTypeServices) { diff --git a/crmeb/app/model/system/SystemMenus.php b/crmeb/app/model/system/SystemMenus.php index de9ac8fc2..9061054aa 100644 --- a/crmeb/app/model/system/SystemMenus.php +++ b/crmeb/app/model/system/SystemMenus.php @@ -67,7 +67,7 @@ class SystemMenus extends BaseModel * @param $value * @return mixed|string */ - public function getPidAttr($value) + public function getPidStrAttr($value) { return !$value ? '顶级' : $this->where('pid', $value)->value('menu_name'); } diff --git a/crmeb/app/services/other/UploadService.php b/crmeb/app/services/other/UploadService.php index 29fad6909..4604df468 100644 --- a/crmeb/app/services/other/UploadService.php +++ b/crmeb/app/services/other/UploadService.php @@ -115,7 +115,9 @@ class UploadService $fileHost = $fileArr['scheme'] . '://' . $fileArr['host']; /** @var SystemStorageServices $storageServices */ $storageServices = app()->make(SystemStorageServices::class); - $storageArr = $storageServices->selectList([])->toArray(); + $storageArr = $storageServices->cacheDriver()->remember('storage_list', function () use ($storageServices) { + return $storageServices->selectList([], 'domain')->toArray(); + }); foreach ($storageArr as $item) { if ($fileHost == $item['domain']) { return self::init($item['type'])->setFilepath($filePath); diff --git a/crmeb/app/services/system/config/SystemConfigServices.php b/crmeb/app/services/system/config/SystemConfigServices.php index 6677bf544..0263b37a1 100644 --- a/crmeb/app/services/system/config/SystemConfigServices.php +++ b/crmeb/app/services/system/config/SystemConfigServices.php @@ -102,13 +102,6 @@ class SystemConfigServices extends BaseServices ], 'show_value' => 1 ], - 'wss_open' => [ - 'son_type' => [ - 'wss_local_cert' => '', - 'wss_local_pk' => '', - ], - 'show_value' => 1 - ], 'invoice_func_status' => [ 'son_type' => [ 'special_invoice_status' => '', @@ -131,32 +124,24 @@ class SystemConfigServices extends BaseServices ], 'show_value' => 1 ], - 'ali_pay_status' => [ + 'allin_pay_status' => [ 'son_type' => [ - 'ali_pay_appid' => '', - 'alipay_merchant_private_key' => '', - 'alipay_public_key' => '', + 'allin_appid' => '', + 'allin_cusid' => '', + 'allin_private_key' => '', ], 'show_value' => 1 ], - 'pay_weixin_open' => [ + 'pay_wechat_type' => [ 'son_type' => [ - 'pay_weixin_mchid' => '', - 'pay_wechat_type' => [ - 'son_type' => [ - 'pay_weixin_key' => '', - ], - 'show_value' => 0 - ], - 'pay_wechat_type@' => [ - 'son_type' => [ - 'pay_weixin_serial_no' => '', - 'pay_weixin_key_v3' => '' - ], - 'show_value' => 1 - ], - 'pay_weixin_client_cert' => '', - 'pay_weixin_client_key' => '', + 'pay_weixin_key' => '', + ], + 'show_value' => 0 + ], + 'pay_wechat_type@' => [ + 'son_type' => [ + 'pay_weixin_serial_no' => '', + 'pay_weixin_key_v3' => '' ], 'show_value' => 1 ], diff --git a/crmeb/app/services/system/config/SystemStorageServices.php b/crmeb/app/services/system/config/SystemStorageServices.php index 1c4a85e58..0ac0710e7 100644 --- a/crmeb/app/services/system/config/SystemStorageServices.php +++ b/crmeb/app/services/system/config/SystemStorageServices.php @@ -84,7 +84,7 @@ class SystemStorageServices extends BaseServices $rule = [ FormBuilder::input('name', '空间名称')->required(), FormBuilder::select('region', '空间区域')->options($upload->getRegion())->required(), - FormBuilder::radio('acl', '读写权限','public-read')->options([ + FormBuilder::radio('acl', '读写权限', 'public-read')->options([ ['label' => '公共读(推荐)', 'value' => 'public-read'], ['label' => '公共读写', 'value' => 'public-read-write'], ])->required(), @@ -176,6 +176,9 @@ class SystemStorageServices extends BaseServices } $storageInfo->is_delete = 1; $storageInfo->save(); + + $this->cacheDriver()->clear(); + return true; } @@ -251,6 +254,9 @@ class SystemStorageServices extends BaseServices $data['update_time'] = time(); $config = $this->getStorageConfig($type); $data['access_key'] = $config['accessKey']; + + $this->cacheDriver()->clear(); + return $this->dao->save($data); } @@ -335,6 +341,9 @@ class SystemStorageServices extends BaseServices if ($data) { $this->dao->saveAll($data); } + + $this->cacheDriver()->clear(); + return true; } @@ -447,6 +456,9 @@ class SystemStorageServices extends BaseServices } return $info->save(); } + + $this->cacheDriver()->clear(); + return true; } } diff --git a/crmeb/app/services/system/lang/LangCountryServices.php b/crmeb/app/services/system/lang/LangCountryServices.php index 8f27302ab..ff0ba08b7 100644 --- a/crmeb/app/services/system/lang/LangCountryServices.php +++ b/crmeb/app/services/system/lang/LangCountryServices.php @@ -87,6 +87,7 @@ class LangCountryServices extends BaseServices $res = $this->dao->save($data); } if (!$res) throw new AdminException(100007); + $this->cacheDriver()->clear(); return true; } @@ -99,6 +100,7 @@ class LangCountryServices extends BaseServices { $res = $this->dao->delete($id); if (!$res) throw new AdminException(100008); + $this->cacheDriver()->clear(); return true; } } \ No newline at end of file diff --git a/crmeb/app/services/system/lang/LangTypeServices.php b/crmeb/app/services/system/lang/LangTypeServices.php index 7a35b9d09..2b7d77a4e 100644 --- a/crmeb/app/services/system/lang/LangTypeServices.php +++ b/crmeb/app/services/system/lang/LangTypeServices.php @@ -82,9 +82,21 @@ class LangTypeServices extends BaseServices } //设置默认 if ($data['is_default'] == 1) $this->dao->update([['id', '<>', $id]], ['is_default' => 0]); + $this->setDefaultLangName(); return true; } + /** + * @author 等风来 + * @email 136327134@qq.com + * @date 2023/2/10 + */ + public function setDefaultLangName() + { + $fileName = $this->dao->value(['is_default' => 1], 'file_name'); + $this->cacheDriver()->set('range_name', $fileName); + } + /** * 修改语言类型状态 * @param $id @@ -94,7 +106,8 @@ class LangTypeServices extends BaseServices public function langTypeStatus($id, $status) { $res = $this->dao->update(['id' => $id], ['status' => $status]); - if(!$res) throw new AdminException(100015); + if (!$res) throw new AdminException(100015); + $this->setDefaultLangName(); return true; } @@ -112,6 +125,7 @@ class LangTypeServices extends BaseServices /** @var LangCodeServices $codeServices */ $codeServices = app()->make(LangCodeServices::class); $codeServices->delete(['type_id' => $id]); + $this->setDefaultLangName(); return true; } } \ No newline at end of file diff --git a/crmeb/app/services/user/LoginServices.php b/crmeb/app/services/user/LoginServices.php index f06a9001f..91feec82c 100644 --- a/crmeb/app/services/user/LoginServices.php +++ b/crmeb/app/services/user/LoginServices.php @@ -252,7 +252,7 @@ class LoginServices extends BaseServices */ public function reset($account, $password) { - $user = $this->dao->getOne(['account|phone' => $account, 'is_del' => 0]); + $user = $this->dao->getOne(['account|phone' => $account, 'is_del' => 0], 'uid'); if (!$user) { throw new ApiException(410032); } diff --git a/crmeb/app/services/user/UserInvoiceServices.php b/crmeb/app/services/user/UserInvoiceServices.php index 8c1cd7124..60c6a903b 100644 --- a/crmeb/app/services/user/UserInvoiceServices.php +++ b/crmeb/app/services/user/UserInvoiceServices.php @@ -36,7 +36,7 @@ class UserInvoiceServices extends BaseServices /** * 检测系统设置发票功能 * @param bool $is_speclial - * @return bool + * @return bool|array */ public function invoiceFuncStatus(bool $is_speclial = true) { diff --git a/crmeb/app/services/user/UserServices.php b/crmeb/app/services/user/UserServices.php index a8f493376..e29604a09 100644 --- a/crmeb/app/services/user/UserServices.php +++ b/crmeb/app/services/user/UserServices.php @@ -1551,7 +1551,7 @@ class UserServices extends BaseServices */ public function eidtNickname(int $uid, array $data) { - if (!$this->getUserInfo($uid)) { + if (!$this->dao->count(['uid' => $uid])) { throw new ApiException(400214); } if (!$this->dao->update($uid, $data, 'uid')) { @@ -1597,7 +1597,7 @@ class UserServices extends BaseServices */ public function spread(int $uid, int $spreadUid, $code) { - $userInfo = $this->getUserInfo($uid); + $userInfo = $this->dao->value(['uid' => $uid], 'uid,spread_uid,spread_time,add_time,last_time'); if (!$userInfo) { throw new ApiException(100026); } @@ -1637,7 +1637,7 @@ class UserServices extends BaseServices } if ($userInfo['uid'] == $userSpreadUid || $userInfo['spread_uid'] == $spreadUid) $check = false; if ($check) { - $spreadInfo = $this->dao->get($spreadUid); + $spreadInfo = $this->dao->get($spreadUid, ['division_id', 'agent_id', 'staff_id']); $data = []; $data['spread_uid'] = $spreadUid; $data['spread_time'] = time(); @@ -1660,7 +1660,7 @@ class UserServices extends BaseServices */ public function setVisit(array $data) { - $userInfo = $this->getUserInfo($data['uid']); + $userInfo = $this->getUserInfo($data['uid'], 'uid,user_type'); if (!$userInfo) { throw new ApiException(100026); } @@ -1780,7 +1780,7 @@ class UserServices extends BaseServices public function checkUserPromoter(int $uid, $user = []) { if (!$user) { - $user = $this->getUserInfo($uid); + $user = $this->getUserInfo($uid, 'spread_open,is_promoter'); } if (!$user) { return false; @@ -1902,7 +1902,7 @@ class UserServices extends BaseServices public function setMemberOverdueTime($vip_day, int $user_id, int $is_money_level, $member_type = false) { if ($vip_day == 0) throw new ApiException(410289); - $user_info = $this->getUserInfo($user_id); + $user_info = $this->getUserInfo($user_id, 'is_money_level,overdue_time'); if (!$user_info) throw new ApiException(410032); if (!$member_type) $member_type = "month"; if ($member_type == 'ever') { @@ -1936,7 +1936,7 @@ class UserServices extends BaseServices { if (!$uid) return false; if (!$userInfo) { - $userInfo = $this->dao->get($uid); + $userInfo = $this->dao->get($uid, ['is_ever_level', 'is_money_level', 'overdue_time']); } if (!$userInfo) return false; if ($userInfo['is_ever_level'] == 0 && $userInfo['is_money_level'] > 0 && $userInfo['overdue_time'] < time()) { diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql index a83383290..3f30f4201 100644 --- a/crmeb/public/install/crmeb.sql +++ b/crmeb/public/install/crmeb.sql @@ -27890,8 +27890,8 @@ CREATE TABLE IF NOT EXISTS `eb_store_coupon_issue` ( -- 转存表中的数据 `eb_store_coupon_issue` -- -INSERT INTO `eb_store_coupon_issue` (`id`, `cid`, `coupon_title`, `start_time`, `end_time`, `total_count`, `remain_count`, `is_permanent`, `status`, `is_give_subscribe`, `is_full_give`, `full_reduction`, `is_del`, `add_time`, `title`, `integral`, `coupon_price`, `use_min_price`, `coupon_time`, `product_id`, `category_id`, `type`, `receive_type`, `start_use_time`, `end_use_time`, `sort`) VALUES -(1, 0, '优惠券', 0, 0, 0, 0, 1, 1, 0, 0, '0.00', 0, 1642574082, '优惠券', 0, '10.00', '30.00', 15, '', 0, 0, 1, 0, 0, 0); +INSERT INTO `eb_store_coupon_issue` (`id`, `cid`, `coupon_title`, `start_time`, `end_time`, `total_count`, `remain_count`, `receive_limit`, `is_permanent`, `status`, `is_give_subscribe`, `is_full_give`, `full_reduction`, `is_del`, `add_time`, `title`, `integral`, `coupon_price`, `use_min_price`, `coupon_time`, `product_id`, `category_id`, `type`, `receive_type`, `start_use_time`, `end_use_time`, `sort`) VALUES +(1, 0, '优惠券', 0, 0, 0, 0, 0, 1, 1, 0, 0, '0.00', 0, 1642574082, '优惠券', 0, '10.00', '30.00', 15, '', 0, 0, 1, 0, 0, 0); -- -------------------------------------------------------- @@ -33033,7 +33033,7 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config (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), -(29, 'pay_weixin_open', 'radio', 'input', 4, '1=>开启\n0=>关闭', 0, '', 0, 0, '1', '开启', '是否启用微信支付', 0, 1), +(29, 'pay_weixin_open', 'radio', 'input', 109, '1=>开启\n0=>关闭', 1, '', 0, 0, '\"1\"', '微信支付', '是否启用微信支付', 100, 1), (32, 'store_free_postage', 'text', 'number', 27, '', 0, 'number:true,min:-1', 100, 0, '1000000', '满额包邮', '商城商品满多少金额即可包邮，此项优先于其他的运费设置', 100, 1), (33, 'offline_postage', 'radio', 'input', 27, '1=>包邮\n0=>不包邮', 1, '', 0, 0, '0', '线下支付是否包邮', '用户选择线下支付时是否包邮', 97, 1), (34, 'integral_ratio', 'text', 'input', 11, '', 0, 'number:true', 100, 0, '\"0.1\"', '积分抵用', '积分抵用比例(1积分抵多少金额)单位：元', 10, 1), @@ -33063,7 +33063,7 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config (123, 'sms_account', 'text', 'input', 18, '', 0, '', 100, 0, '\"\"', '一号通账号', '短信后台的登录账号', 0, 1), (137, 'sms_token', 'text', 'input', 18, '', 0, '', 100, 0, '\"\"', '一号通密码', '短信后台的登录密码)', 0, 1), (138, 'h5_avatar', 'upload', 'input', 101, '', 1, '', 0, 0, '\"\\/statics\\/system_images\\/default_avatar.jpeg\"', '用户默认头像', '用户默认头像，后台添加用户以及用户登录的默认头像显示，尺寸(80*80)', 3, 1), -(139, 'offline_pay_status', 'radio', '', 29, '1=>开启\n2=>关闭', 0, '', 0, 0, '1', '线下支付状态', '线下支付请选择开启或关闭', 0, 1), +(139, 'offline_pay_status', 'radio', 'input', 109, '1=>开启\n2=>关闭', 1, '', 0, 0, '\"1\"', '线下支付', '线下支付请选择开启或关闭', 89, 1), (141, 'recharge_switch', 'radio', 'input', 28, '1=>开启\n0=>关闭', 1, '', 0, 0, '0', '小程序充值开关', '仅小程序端的充值开关，小程序提交审核前,需要关闭此功能', 4, 1), (142, 'tengxun_map_key', 'text', 'input', 26, '', 1, '', 0, 0, '\"SMJBZ-WCHK4-ZPZUA-DSIXI-XDDVQ-XWFX7\"', '腾讯地图KEY', '腾讯地图KEY，申请地址：https://lbs.qq.com', 0, 1), (143, 'store_self_mention', 'radio', 'input', 27, '1=>开启\n0=>关闭', 1, '', 0, 0, '1', '是否开启到店自提', '开启后下单页面支持到店自提，需要在设置->发货设置->提货点设置中添加提货点，关闭则隐藏此功能', 95, 1), @@ -33084,7 +33084,7 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config (160, 'store_brokerage_price', 'text', 'input', 72, '', 0, '', 100, 0, '\"100\"', '满额分销最低金额', '满额分销满足金额开通分销权限', 0, 1), (162, 'price_revision_switch', 'radio', 'input', 20, '0=>关闭\n1=>开启', 0, '', 0, 0, '0', '改价短信提醒开关', '改价短信提醒开关', 0, 1), (168, 'site_logo_square', 'upload', 'input', 26, '', 1, '', 0, 0, '\"\\/statics\\/system_images\\/admin_logo_small.png\"', '后台小LOGO', '后台菜单缩进小LOGO，尺寸180*180', 6, 1), -(170, 'yue_pay_status', 'radio', '', 30, '1=>开启\n2=>关闭', 0, '', 0, 0, '1', '余额支付状态', '余额支付请选择开启或关闭', 0, 1), +(170, 'yue_pay_status', 'radio', 'input', 109, '1=>开启\n2=>关闭', 1, '', 0, 0, '\"1\"', '余额支付', '余额支付请选择开启或关闭', 95, 1), (171, 'login_logo', 'upload', 'input', 26, '', 1, '', 0, 0, '\"\\/statics\\/system_images\\/admin_login_logo.png\"', '后台登录页LOGO', '后台登录页LOGO，建议尺寸270x75', 8, 1), (173, 'qiniu_accessKey', 'text', 'input', 80, '', 0, '', 100, 0, '\"\"', 'accessKey', '七牛云accessKey', 0, 1), (174, 'qiniu_secretKey', 'text', 'input', 80, '', 0, '', 100, 0, '\"\"', 'secretKey', '七牛云secretKey', 0, 1), @@ -33105,7 +33105,7 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config (236, 'verify_expire_time', 'text', 'input', 20, '', 0, '', 100, 0, '\"5\"', '短信验证码过期时间（分钟）', '短信验证码过期时间（分钟）', 0, 1), (246, 'invoice_func_status', 'radio', '', 50, '1=>开启\n0=>关闭', 0, '', 0, 0, '1', '发票功能启用', '发票功能开启|关闭', 0, 1), (247, 'special_invoice_status', 'radio', '', 50, '1=>开启\n0=>关闭', 0, '', 0, 0, '1', '专用发票启用', '专用发票功能开启|关闭', 0, 1), -(287, 'ali_pay_status', 'radio', '', 63, '1=>开启\n0=>关闭', 0, '', 0, 0, '1', '支付宝支付状态', '支付宝支付请选择开启(启用)或关闭(不启用)', 100, 1), +(287, 'ali_pay_status', 'radio', 'input', 109, '1=>开启\n0=>关闭', 1, '', 0, 0, '\"1\"', '支付宝支付', '支付宝支付请选择开启(启用)或关闭(不启用)', 98, 1), (288, 'alipay_public_key', 'textarea', '', 63, '', 1, '', 100, 5, '\"\"', '支付应用公钥', '支付宝加签完成后申城的支付宝公钥', 0, 1), (289, 'alipay_merchant_private_key', 'textarea', '', 63, '', 0, '', 100, 5, '\"\"', '支付应用私钥', '支付应用私钥', 0, 1), (290, 'ali_pay_appid', 'text', 'input', 63, '', 0, '', 100, 0, '\"\"', '支付应用Appid', '支付应用Appid', 91, 1), @@ -33180,7 +33180,7 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config (387, 'config_export_type', 'radio', 'input', 93, '1=>一号通', 1, '', 0, 0, '1', '电子面单类型', '电子面单类型', 0, 1), (388, 'customer_corpId', 'text', 'input', 69, '', 1, '', 0, 0, '\"\"', '企业ID', '如果客服链接填写企业微信客服，小程序需要跳转企业微信客服的话需要配置此项，并且在小程序客服中绑定企业ID', 0, 1), (389, 'create_wechat_user', 'radio', 'input', 2, '1=>开启\r\n0=>关闭', 1, '', 0, 0, '0', '关注公众号是否生成用户', '关注公众号是否生成用户', 0, 1), -(390, 'friend_pay_status', 'radio', 'input', 95, '1=>开启\r\n0=>关闭', 1, '', 0, 0, '0', '好友代付开关', '好友代付开关，关闭后付款类型不显示好友代付', 0, 1), +(390, 'friend_pay_status', 'radio', 'input', 109, '1=>开启\r\n0=>关闭', 1, '', 0, 0, '0', '好友代付', '好友代付开关，关闭后付款类型不显示好友代付', 0, 1), (392, 'brokerage_level', 'radio', 'input', 72, '1=>一级分销\r\n2=>二级分销', 1, '', 0, 0, '2', '分销层级', '分销层级，一级是只返上级一层的佣金，二级是返上级和上上级的佣金', 98, 1), (393, 'sms_type', 'radio', 'input', 97, '0=>一号通\r\n1=>阿里云\r\n2=>腾讯云', 1, '', 0, 0, '0', '短信类型', '短信类型，选择发送的短信类型', 0, 1), (394, 'aliyun_AccessKeyId', 'text', 'input', 98, '', 1, '', 0, 0, '\"\"', '阿里云AccessKeyId', '阿里云AccessKeyId', 100, 1), @@ -33201,18 +33201,19 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config (415, 'pay_weixin_key_v3', 'text', 'input', 4, '', 1, '', 100, 0, '\"\"', 'V3支付Key', 'V3支付秘钥', 0, 1), (416, 'reward_money', 'text', 'number', 105, '', 1, '', 0, 0, '\"0\"', '赠送余额(元)', '新用户奖励金额，必须大于等于0，0为不赠送', 0, 1), (417, 'reward_integral', 'text', 'number', 105, '', 1, '', 0, 0, '\"0\"', '赠送积分', '新用户奖励积分，必须大于等于0，0为不赠送', 0, 1), -(418, 'hs_accesskey', 'text', 'input', 106, '', 1, '', 0, 0, '\"AKLTMzkzZTEzNjg3OTg2NDViM2IwNmFlYzhmNzE4MmI4YmI\"', '火山翻译AccessKey', '机器翻译仅支持火山翻译', 1, 1), -(419, 'hs_secretkey', 'text', 'input', 106, '', 1, '', 0, 0, '\"TVRneU16STFOVFV4WVRkbE5ERTJaV0pqWm1aaU1UaGlNVFppWldZeE1HUQ==\"', '火山翻译SecretKey', '机器翻译仅支持火山翻译', 0, 1), +(418, 'hs_accesskey', 'text', 'input', 106, '', 1, '', 0, 0, '\"\"', '火山翻译AccessKey', '机器翻译仅支持火山翻译', 1, 1), +(419, 'hs_secretkey', 'text', 'input', 106, '', 1, '', 0, 0, '\"\"', '火山翻译SecretKey', '机器翻译仅支持火山翻译', 0, 1), (420, 'fey_user', 'text', 'input', 107, '', 1, '', 0, 0, '\"\"', '飞鹅云USER', '飞鹅云后台注册账号', 10, 1), (421, 'fey_ukey', 'text', 'input', 107, '', 1, '', 0, 0, '\"\"', '飞鹅云UYEK', '飞鹅云后台注册账号后生成的UKEY 【备注：这不是填打印机的KEY】', 7, 1), (422, 'fey_sn', 'text', 'input', 107, '', 1, '', 100, 0, '\"\"', '飞鹅云SN', '打印机标签上的编号，必须要在管理后台里添加打印机或调用API接口添加之后，才能调用API', 0, 1), (423, 'allin_private_key', 'textarea', 'input', 108, '', 1, '', 100, 5, '\"\"', '通联RSA私钥', '通联支付的RSA私钥，可以在商户后台设置中进行配置', 96, 1), -(424, 'allin_public_key', 'textarea', 'input', 108, '', 1, '', 100, 5, '\"\"', '通联RSA公钥', '通联支付的RSA公钥，可以在商户后台的设置中进行配置', 97, 1), (425, 'allin_cusid', 'text', '', 108, '', 1, '', 100, 0, '\"\"', '通联商户号', '通联支付商户号，由贵公司申请获得', 99, 1), (426, 'allin_appid', 'text', '', 108, '', 1, '', 100, 0, '\"\"', '通联支付Appid', '通联商户后台的设置-》对接设置中查看', 98, 1), -(427, 'allin_pay_status', 'radio', 'input', 108, '0=>关闭\n1=>开启', 1, '', 0, 0, '1', '开关', '开启可以在微信公众号和微信小程序中使用通联支付', 100, 1), +(427, 'allin_pay_status', 'radio', 'input', 108, '1=>开启\n0=>关闭', 1, '', 0, 0, '0', '通联支付开关', '开启可以在微信公众号和微信小程序中使用通联支付', 100, 1), (428, 'queue_open', 'radio', 'input', 26, '0=>关闭\n1=>开启', 1, '', 0, 0, '\"0\"', '消息队列', '是否启用消息队列，启用后提升程序运行速度，启用前必须配置Redis缓存', 0, 1), -(429, 'get_avatar', 'radio', 'input', 7, '0=>关闭\n1=>开启', 1, '', 0, 0, '\"0\"', '强制获取昵称头像', '是否在小程序用户授权之后，弹窗获取用户的昵称和头像', 0, 1); +(429, 'get_avatar', 'radio', 'input', 7, '0=>关闭\n1=>开启', 1, '', 0, 0, '\"0\"', '强制获取昵称头像', '是否在小程序用户授权之后，弹窗获取用户的昵称和头像', 0, 1), +(430, 'wechat_pay_type', 'radio', 'input', 4, '0=>普通微信支付\n1=>通联微信支付', 1, '', 0, 0, '\"0\"', '支付方式', '微信支付的支付方式，普通微信支付或者通联聚合支付中的微信支付', 0, 1), +(431, 'alipay_pay_type', 'radio', 'input', 63, '0=>默认支付宝支付\n1=>通联支付宝支付', 1, '', 0, 0, '\"0\"', '支付方式', '支付宝支付方式，普通支付宝支付和通联聚合支付中支付宝支付', 0, 1); -- -------------------------------------------------------- @@ -33251,8 +33252,6 @@ INSERT INTO `eb_system_config_tab` (`id`, `pid`, `title`, `eng_title`, `status`, (26, 1, '站点配置', 'web_site', 1, 0, '', 0, 100), (27, 5, '商城基础配置', 'store_base', 1, 0, '', 0, 100), (28, 100, '用户充值配置', 'recharge_site', 1, 0, '', 0, 2), -(29, 23, '线下支付配置', 'offline_pay', 1, 0, '', 3, 0), -(30, 23, '余额支付配置', 'balance_pay', 1, 0, '', 3, 0), (31, 79, '基础配置', 'base_config', 0, 0, '', 0, 0), (41, 65, '采集商品配置', 'copy_product', 1, 0, '', 3, 0), (45, 100, '用户等级配置', 'store_member', 1, 0, '', 0, 3), @@ -33283,7 +33282,6 @@ INSERT INTO `eb_system_config_tab` (`id`, `pid`, `title`, `eng_title`, `status`, (92, 64, '阿里云配置', 'logistics_aliyun', 1, 0, '', 3, 0), (93, 66, '基础配置', 'electronic_basic', 1, 0, '', 3, 0), (94, 66, '一号通配置', 'system_electronic_config', 1, 0, '', 3, 0), -(95, 23, '好友代付', 'friend_pay', 1, 0, '', 3, 0), (96, 65, '短信接口配置', 'sms_config', 1, 0, '', 3, 0), (97, 96, '基础配置', 'sms_config_basic', 1, 0, '', 3, 0), (98, 96, '阿里云配置', 'sms_aliyun', 1, 0, '', 3, 0), @@ -33296,7 +33294,8 @@ INSERT INTO `eb_system_config_tab` (`id`, `pid`, `title`, `eng_title`, `status`, (105, 100, '新用户设置', 'new_user_setting', 1, 0, '', 0, 0), (106, 5, '机器翻译配置', 'online_translation', 1, 0, '', 0, 0), (107, 21, '飞鹅云配置', 'fey_config', 1, 0, '', 3, 0), -(108, 23, '通联支付', 'allinpay', 1, 0, '', 3, 0); +(108, 23, '通联支付', 'allinpay', 1, 0, '', 3, 0), +(109, 23, '基础配置', 'pay_basic', 1, 0, '', 3, 100); -- --------------------------------------------------------