diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php index 84f7ae6d..a32014bc 100644 --- a/app/controller/api/store/order/StoreOrder.php +++ b/app/controller/api/store/order/StoreOrder.php @@ -315,9 +315,18 @@ class StoreOrder extends BaseController //商户id 金额 $merId = $this->request->param('mer_id'); $money = $this->request->param('money'); - if(empty($money) || empty($merId)){ + + if(empty($merId)){ return app('json')->fail('参数缺失'); } + + if(empty($money)){ + //初始化 + return app('json')->success($this->repository->beginMerchant($merId)); + } + + + $where = [ "a.mer_id" => $merId, "p.is_show" => 1,