Merge branch 'master' of http://git.huxiukeji.com/lizhen/lanjingling

application/api/controller/Companys.php

@@ -121,6 +121,7 @@ class Companys extends Api
             $comeform = $this->request->param('comeform','');
             $where['id'] = $id;
             $where['status'] = 1;
+            $time = time();
             $company = $this->model->where($where)->find();
             if (empty($company)) {
                 throw new Exception('未找到门店信息');
@@ -143,7 +144,12 @@ class Companys extends Api
                 $walletData = [
                     'user_id' => $userId,
                     'company_id' => $id,
+                    'staff_id' => 0,
                     'money' => 0.00,
+                    'address' => '',
+                    'createtime' => $time,
+                    'updatetime' => $time,
+                    'remark' => '',
                     'comefrom' => $comeform,
                 ];
                 $walletRes = model('UserWallet')->insertGetId($walletData);

application/config.php

@@ -306,8 +306,10 @@ return [
 
     //用户端小程序
     'user_wxMiniProgram' => [
-        'appid'=>'wx1bc47f317884cb40',
-        'secret'=>'9d382a035255f7901b8a0f76ce129f29',
+        //'appid'=>'wx1bc47f317884cb40',
+        'appid'=>'wxcdb15751a5a2b878',
+        //'secret'=>'9d382a035255f7901b8a0f76ce129f29',
+        'secret'=>'5d69ab5688e4b645a146d0cc0814e6f9',
         'mch_id' => '1625774482',//商户号
         'key'    => 'DRs2yi80exLRn6tI4cBhISMfj7SPYMQG',//api密钥
     ],
@@ -315,17 +317,17 @@ return [
 
     //商家端小程序，鲁享途中
     'company_wxMiniProgram' => [
-        'appid'=>'wx9a7153e5b40d9663',
-//        'appid'=>'wx4cbb35e016ab6671',
-        'secret'=>'8a743955faa5873af394f31d4a58c086',
-//        'secret'=>'cd448b0740ae8e38ea7e2bcd96c6cdfd',
+        //'appid'=>'wx9a7153e5b40d9663',
+        'appid'=>'wx4cbb35e016ab6671',
+        //'secret'=>'8a743955faa5873af394f31d4a58c086',
+        'secret'=>'cd448b0740ae8e38ea7e2bcd96c6cdfd',
     ],
 
     //阿里云短信配置
     'alisms' =>[
-        'template' => 'SMS_177420029',
-        'sign' => '恋爱话术',
-        'key' => 'LTAI4FpgoSepJBCA6C8FGnzU',
-        'secret' => 'rsUsqjFKKjwpoYFz0Qhm0Y0lI6RYDx',
+        'template' => 'SMS_280115358',
+        'sign' => '中蓝养车',
+        'key' => 'LTAI5tGhFauMXWNWoLJsH6qK',
+        'secret' => 'FwLSFS7QtyBpQglFjtEEQXL0VftRs0',
     ],
 ];

application/database.php

@@ -16,7 +16,7 @@ return [
     // 数据库类型
     'type'            => Env::get('database.type', 'mysql'),
     // 服务器地址
-    'hostname'        => Env::get('database.hostname', '106.14.27.14'),
+    'hostname'        => Env::get('database.hostname', '127.0.0.1'),
     // 数据库名
     'database'        => Env::get('database.database', 'yangche'),
     // 用户名

application/extra/param.php

@@ -4,24 +4,24 @@ return [
     //微信消息模版 (注:模版ID需要写到下面消息模版ID参数中)
     'wechat_template' => [
         'pre_order' => [  //预约模版
-            'template_id'       => 'are5ILn3yVsSo1mgDmvrsruFSFDZ599Qf7j4BRf8TIU',//模版ID
+            'template_id'       => 'TsG-62YzB7zHwQ9T5PMdSPsur9mfr9L-mMhMoqi-Emk',//模版ID
             'page'              => 'pages/home/maintenance/reserveRecord',//跳转地址
-            'miniprogram_state' => 'trial',//跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
+            'miniprogram_state' => 'formal',//跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
         ],
         'order' => [  //订单模版
-            'template_id'       => 'tMSenoMJundYGJHx6JyotRepbN8d80whfobs_EvS_lY',//模版ID
+            'template_id'       => '83-333geAfLADp_bcY-4UNcMvfkheyluQAuPESaTbUA',//模版ID
             'page'              => 'pages/order/detail',//跳转地址
-            'miniprogram_state' => 'trial',//跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
+            'miniprogram_state' => 'formal',//跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
         ],
     ],
     //微信消息模版ID
     'wechat_template_ids' => [
-        'are5ILn3yVsSo1mgDmvrsruFSFDZ599Qf7j4BRf8TIU',
-        'tMSenoMJundYGJHx6JyotRepbN8d80whfobs_EvS_lY',
+        'TsG-62YzB7zHwQ9T5PMdSPsur9mfr9L-mMhMoqi-Emk',
+        '83-333geAfLADp_bcY-4UNcMvfkheyluQAuPESaTbUA',
     ],
-    'pay_test' => 1,//支付测试(支付1分钱)  1=测试，0正常
-    'wechat_setting' => 'test',//微信消息模版：test=测试,release=正式
+    'pay_test' => 0,//支付测试(支付1分钱)  1=测试，0正常
+    'wechat_setting' => 'release',//微信消息模版：test=测试,release=正式
     'mini_code' => [
-        'env_version'=>'trial',//正式版为 "release"，体验版为 "trial"，开发版为 "develop"。默认是正式版。
+        'env_version'=>'release',//正式版为 "release"，体验版为 "trial"，开发版为 "develop"。默认是正式版。
     ],
 ];