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

application/common/model/Wallet.php

@@ -42,7 +42,8 @@ class Wallet extends Model
         //所有钱包余额
         $wallet = Db::name('user_wallet')->where(['user_id' => $user_id,'company_id' => $company_id])->lock(true)->find();
         if(!$wallet) {
-            abort(500,'钱包余额获取失败');
+            return 0;
+            //abort(500,'钱包余额获取失败');
         }
 
         if($wallet_name) { //返回指定钱包

application/config.php

@@ -306,10 +306,10 @@ return [
 
     //用户端小程序
     'user_wxMiniProgram' => [
-        'appid'=>'wx9a7153e5b40d9663',
-        'secret'=>'8a743955faa5873af394f31d4a58c086',
-        'mch_id' => '',//商户号
-        'key'    => '',//api密钥
+        'appid'=>'wx1bc47f317884cb40',
+        'secret'=>'9d382a035255f7901b8a0f76ce129f29',
+        'mch_id' => '1625774482',//商户号
+        'key'    => 'DRs2yi80exLRn6tI4cBhISMfj7SPYMQG',//api密钥
     ],