更新优化

crmeb/app/services/other/export/ExportServices.php

@@ -482,23 +482,13 @@ class ExportServices extends BaseServices
         $export = [];
         if (!empty($data)) {
             foreach ($data as $item) {
-                switch ($item['recharge_type']) {
-                    case 'routine':
-                        $item['_recharge_type'] = '小程序充值';
-                        break;
-                    case 'weixin':
-                        $item['_recharge_type'] = '公众号充值';
-                        break;
-                    default:
-                        $item['_recharge_type'] = '其他充值';
-                        break;
-                }
                 $item['_pay_time'] = $item['pay_time'] ? date('Y-m-d H:i:s', $item['pay_time']) : '暂无';
                 $item['_add_time'] = $item['add_time'] ? date('Y-m-d H:i:s', $item['add_time']) : '暂无';
                 $item['paid_type'] = $item['paid'] ? '已支付' : '未支付';
 
                 $export[] = [
                     $item['nickname'],
+                    $item['order_id'],
                     $item['price'],
                     $item['paid_type'],
                     $item['_recharge_type'],
@@ -508,7 +498,7 @@ class ExportServices extends BaseServices
                 ];
             }
         }
-        $header = ['昵称/姓名', '充值金额', '是否支付', '充值类型', '支付时间', '是否退款', '添加时间'];
+        $header = ['昵称/姓名', '订单号', '充值金额', '是否支付', '充值类型', '支付时间', '是否退款', '添加时间'];
         $title = ['充值记录', '充值记录' . time(), ' 生成时间：' . date('Y-m-d H:i:s', time())];
         $filename = '充值记录_' . date('YmdHis', time());
         $suffix = 'xlsx';

crmeb/app/services/user/UserServices.php

@@ -1035,7 +1035,7 @@ class UserServices extends BaseServices
             throw new AdminException(400214);
         }
         $timeDiff = $userInfo['is_ever_level'] == 1 ? '永久' : date('Y-m-d H:i:s', $userInfo['overdue_time']);
-        $dayDiff = intval(($userInfo['overdue_time'] - time()) / 86400);
+        $dayDiff = $userInfo['overdue_time'] > time() ? intval(($userInfo['overdue_time'] - time()) / 86400) : 0;
         $field[] = Form::input('time_diff', '到期时间', $timeDiff)->style(['width' => '200px'])->readonly(true);
         if ($userInfo['is_ever_level'] == 0) {
             $field[] = Form::input('day_diff', '剩余天数', $dayDiff)->style(['width' => '200px'])->readonly(true);

crmeb/config/lang.php

@@ -19,7 +19,7 @@ return [
     // 默认语言
     'default_lang' => Env::get('lang.default_lang', 'zh-cn'),
     // 允许的语言列表
-    'allow_lang_list' => ['zh-cn', 'en-us', 'ja_jp', 'fr_fr', 'th_th', 'it_it', 'ko_kr', 'vi_vn', 'zh_ft'],
+    'allow_lang_list' => ['zh-cn', 'en-us'],
     // 多语言自动侦测变量名
     'detect_var' => 'lang',
     // 是否使用Cookie记录
@@ -30,27 +30,11 @@ return [
     'extend_list' => [
         'zh_cn' => app()->getBasePath() . 'lang/zh_cn.php',
         'en_us' => app()->getBasePath() . 'lang/en_us.php',
-        'ja_jp' => app()->getBasePath() . 'lang/ja_jp.php',
-        'fr_fr' => app()->getBasePath() . 'lang/fr_fr.php',
-        'th_th' => app()->getBasePath() . 'lang/th_th.php',
-        'it_it' => app()->getBasePath() . 'lang/it_it.php',
-        'ko_kr' => app()->getBasePath() . 'lang/ko_kr.php',
-        'mn_mn' => app()->getBasePath() . 'lang/mn_mn.php',
-        'vi_vn' => app()->getBasePath() . 'lang/vi_vn.php',
-        'zh_ft' => app()->getBasePath() . 'lang/zh_ft.php',
     ],
     // Accept-Language转义为对应语言包名称
     'accept_language' => [
         'zh-hans-cn' => 'zh_cn',
         'en-hans-us' => 'en_us',
-        'ja-hans-jp' => 'ja_jp',
-        'fr-hans-fr' => 'fr_fr',
-        'th-hans-th' => 'th_th',
-        'it-hans-it' => 'it_it',
-        'ko-hans-kr' => 'ko_kr',
-        'mn-hans-mn' => 'mn_mn',
-        'vi-hans-vn' => 'vi_vn',
-        'zh-hans-ft' => 'zh_ft',
     ],
     // 是否支持语言分组
     'allow_group' => true,

crmeb/public/install/crmeb.sql

@@ -33351,7 +33351,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', 109, '0=>关闭\nweixin=>微信\nallinpay=>通联', 1, '', 0, 0, '\"0\"', '微信支付', '请选择微信支付通道，关闭用户端不展示', 100, 1),
+(29, 'pay_weixin_open', 'radio', 'input', 109, '0=>关闭\nweixin=>微信\nallinpay=>通联', 1, '', 0, 0, '\"weixin\"', '微信支付', '请选择微信支付通道，关闭用户端不展示', 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),