Merge branch 'master' of https://git.bjtdba.com/shop/php

README.md

@@ -1,4 +1,4 @@
-# 老来享
+# 幸福保
 ## 开发环境
 
 - mac 10.15

app/controller/api/merchant/order/OrderMerchant.php

@@ -11,6 +11,7 @@ use app\common\repositories\merchant\MerchantRepository;
 use app\traits\HaikeApiRequest;
 use app\traits\HuiPay;
 use think\App;
+use think\Exception;
 use crmeb\basic\BaseController;
 use app\common\repositories\merchant\order\OrderMerchantRepository as repository;
 use think\facade\Cache;
@@ -749,6 +750,7 @@ class OrderMerchant extends BaseController
                         return app('json')->success(['result' => 'ERROR']);
                     return app('json')->success(['result' => 'SUCCESS']);
                 }catch (Exception $exception){
+                    Db::name("log")->insert(array('data'=>$exception->getFile().'：'.$exception->getLine().'【'.$exception->getMessage().'】'));
                     return app('json')->fail('错误2');
                 }
             }