zhanglinxin 1 year ago
parent
commit
e4d35402ca

+ 10 - 10
application/api/controller/Approve.php

@@ -115,7 +115,7 @@ class Approve extends Base
      */
     public function get_detail()
     {
-        $id = input('approve_id',0) ?:0;
+        $id = input('approve_id') ?: 0;
         $user = $this->user;
         $info = ApproveService::get_detail($id, $user, 'detail');
         $this->success('详情', $info);
@@ -132,7 +132,7 @@ class Approve extends Base
      */
     public function get_info()
     {
-        $id = input('approve_id',0) ?:0;
+        $id = input('approve_id') ?: 0;
         $user = $this->user;
         $info = ApproveService::get_detail($id, $user, 'info');
         $this->success('信息', $info);
@@ -149,11 +149,11 @@ class Approve extends Base
      **/
     public function audit()
     {
-        $id = input('approve_id',0) ?:0;
-        $status = input('status', 0) ?:0;
-        $remark = input('remark', '') ?:'';
-        $maintain_user_id = input('maintain_user_id', 0) ?:0;
-        $params = compact("id", "status", "remark","maintain_user_id");
+        $id = input('approve_id') ?: 0;
+        $status = input('status') ?: 0;
+        $remark = input('remark') ?: '';
+        $maintain_user_id = input('maintain_user_id') ?: 0;
+        $params = compact("id", "status", "remark", "maintain_user_id");
         $user = $this->user;
         ApproveService::make($id, $params, $user, 'audit');
         $this->success('确认成功');
@@ -170,9 +170,9 @@ class Approve extends Base
      **/
     public function feedback()
     {
-        $id = input('approve_id',0) ?:0;
-        $feedback = input('feedback', '') ?:'';
-        $feedback_images = input('feedback_images', '')?:'';
+        $id = input('approve_id') ?: 0;
+        $feedback = input('feedback') ?: '';
+        $feedback_images = input('feedback_images') ?: '';
         $params = compact("id", "feedback", "feedback_images");
         $user = $this->user;
         ApproveService::make($id, $params, $user, 'feedback');

+ 2 - 2
application/api/controller/Approveflow.php

@@ -39,8 +39,8 @@ class Approveflow extends Base
      */
     public function get_data()
     {
-        $module = input('module');
-        $flow_item = input('flow_item');
+        $module = input('module') ?: 0;
+        $flow_item = input('flow_item') ?: 0;
         $user = $this->user;
         $data = ApproveFlowService::get_data($module, $flow_item,$user);
         $this->success(CommonConstant::get_module_list()[$module] .'审批流程', $data);

+ 25 - 25
application/api/controller/Approveinfo.php

@@ -116,24 +116,24 @@ class Approveinfo extends Base
         // {"way":"create","id":"","module":"1","apply_user_id":"","reason":"测试","type":"1","desc":"","start_time":"","end_time":"","document":"","images":"","remark":"","total_amount":"1000","pay_type":"1","word_size":"","apply_id":"0","number":"","is_who":"","start_am":"","end_am":"","time":"","reach_address":"","end_address":"","scope":"","legal_opinion":"","founder":"","serial_number":"","apply_date":"","degree":"","department":"","department_sign":"","approve_user":"1925696723824730358","copy_user":"","apply_goods":[{"goods_id":"1","goods_category_first":"1","goods_category_id":"3","goods_no":"100001","goods_name":"医疗口罩一次性","goods_brand":"一次性口罩","goods_stock":[{"id":"1","name":"均码,白色","price":"1","stock":"110"},{"id":"2","name":"均码,蓝色","price":"1","stock":"100"},{"id":"19","name":"均码,红色","price":"1","stock":"120"}]},{"goods_id":"2","goods_category_first":"1","goods_category_id":"3","goods_no":"100002","goods_name":"84消毒液","goods_brand":"安其生","goods_stock":[{"id":"3","name":"380ml,低浓度","price":"1","stock":"110"},{"id":"4","name":"380ml,高浓度","price":"1","stock":"100"}]},{"goods_id":"","goods_category_first":"1","goods_category_id":"3","goods_no":"100003","goods_name":"一次性手套丁腈橡胶","goods_brand":"万力","goods_stock":[{"name":"白色","price":"0.2","stock":"110"},{"name":"蓝色","price":"0.2","stock":"100"}]}],"peer_user":[{"is_who":"","user_id":"","name":"","desc":""}]}
 
         // {"way":"create","id":"","module":"3","apply_user_id":"","reason":"测试","type":"","desc":"","start_time":"","end_time":"","document":"","images":"","remark":"入库备注","total_amount":"","pay_type":"","word_size":"","apply_id":"0","number":"","is_who":"","start_am":"","end_am":"","time":"","reach_address":"","end_address":"","scope":"","legal_opinion":"","founder":"","serial_number":"","apply_date":"","degree":"","department":"","department_sign":"","approve_user":"1925696723824730358","copy_user":"","stock_goods":[{"goods_id":"1","goods_category_first":"1","goods_category_id":"3","goods_no":"100001","goods_name":"医疗口罩一次性","goods_brand":"一次性口罩","goods_stock":[{"id":"1","name":"均码,白色","price":"1","stock":"110"},{"id":"2","name":"均码,蓝色","price":"1","stock":"100"},{"id":"19","name":"均码,红色","price":"1","stock":"120"}]},{"goods_id":"2","goods_category_first":"1","goods_category_id":"3","goods_no":"100002","goods_name":"84消毒液","goods_brand":"安其生","goods_stock":[{"id":"3","name":"380ml,低浓度","price":"1","stock":"110"},{"id":"4","name":"380ml,高浓度","price":"1","stock":"100"}]},{"goods_id":"","goods_category_first":"1","goods_category_id":"3","goods_no":"100003","goods_name":"一次性手套丁腈橡胶","goods_brand":"万力","goods_stock":[{"name":"白色","price":"0.2","stock":"110"},{"name":"蓝色","price":"0.2","stock":"100"}]}],"peer_user":[{"is_who":"","user_id":"","name":"","desc":""}]}
-        $way = input('way');
-        $id = input('id', 0);
-        $module = input('module');
-        $apply_user_id = input('apply_user_id', '');
-        $reason = input('reason');
-        $type = input('type', 0);
-        $desc = input('desc');
+        $way = input('way') ?: '';
+        $id = input('id') ?: 0;
+        $module = input('module') ?: 0;
+        $apply_user_id = input('apply_user_id')?: '';
+        $reason = input('reason') ?: '';
+        $type = input('type') ?: 0;
+        $desc = input('desc') ?: '';
         $start_time = input('start_time');
         $end_time = input('end_time');
-        $document = input('document');
-        $images = input('images');
-        $remark = input('remark');
-        $total_amount = input('total_amount', 0);
-        $pay_type = input('pay_type', 0);
+        $document = input('document')?: '';
+        $images = input('images')?: '';
+        $remark = input('remark')?: '';
+        $total_amount = input('total_amount')?: 0;
+        $pay_type = input('pay_type')?: 0;
         $word_size = input('word_size');
-        $apply_id = input('apply_id', 0);
-        $number = input('number', 0);
-        $is_who = input('is_who', 0);
+        $apply_id = input('apply_id')?: 0;
+        $number = input('number')?: 0;
+        $is_who = input('is_who')?: 0;
         $start_am = input('start_am');
         $end_am = input('end_am');
         $time = input('time');
@@ -217,10 +217,10 @@ class Approveinfo extends Base
      */
     public function get_list()
     {
-        $group = input('group', 'list');
-        $module = input('module', 0);
-        $status = input('status', 0);
-        $search = input('search', '');
+        $group = input('group') ?: 'list';
+        $module = input('module') ?: 0;
+        $status = input('status') ?: 0;
+        $search = input('search') ?: '';
         $offset = $this->off_set;
         $length = $this->page_num;
         $user = $this->user;
@@ -326,9 +326,9 @@ class Approveinfo extends Base
      */
     public function get_detail()
     {
-        $id = input('id');
+        $id = input('id') ?: 0;
         $user = $this->user;
-        $info = ApproveInfoService::get_detail($id, $user, CommonConstant::IS_WHO_1,'detail');
+        $info = ApproveInfoService::get_detail($id, $user, CommonConstant::IS_WHO_1, 'detail');
         $this->success('详情', $info);
     }
 
@@ -390,9 +390,9 @@ class Approveinfo extends Base
      **/
     public function get_info()
     {
-        $id = input('id');
+        $id = input('id') ?: 0;
         $user = $this->user;
-        $info = ApproveInfoService::get_detail($id, $user, CommonConstant::IS_WHO_1,'info');
+        $info = ApproveInfoService::get_detail($id, $user, CommonConstant::IS_WHO_1, 'info');
         $this->success('信息', $info);
     }
 
@@ -404,7 +404,7 @@ class Approveinfo extends Base
      */
     public function urging()
     {
-        $id = input('id');
+        $id = input('id') ?: 0;
         $user = $this->user;
         Db::startTrans();
         try {
@@ -425,7 +425,7 @@ class Approveinfo extends Base
      */
     public function cancel()
     {
-        $id = input('id');
+        $id = input('id') ?: 0;
         $user = $this->user;
         Db::startTrans();
         try {

+ 4 - 4
application/api/controller/Goods.php

@@ -25,7 +25,7 @@ class Goods extends Base
      *
      * @Apidoc\Method("POST")
      * @Apidoc\Param("category_id", type="integer", require=false, desc="二级分类ID")
-     *  @Apidoc\Param("search", type="string", require=false, desc="搜索 商品名称")
+     * @Apidoc\Param("search", type="string", require=false, desc="搜索 商品名称")
      * @Apidoc\Returned("id", type="integer", desc="商品ID")
      * @Apidoc\Returned("goods_name", type="integer", desc="商品名称")
      * @Apidoc\Returned("weigh", type="integer", desc="权重")
@@ -38,9 +38,9 @@ class Goods extends Base
      */
     public function get_list()
     {
-        $category_id = input('category_id',0);
-        $search = input('search','');
-        $data = GoodsService::get_list($category_id,$search);
+        $category_id = input('category_id') ?: 0;
+        $search = input('search') ?: '';
+        $data = GoodsService::get_list($category_id, $search);
         $this->success('商品列表', $data);
     }
 

+ 3 - 3
application/api/controller/Login.php

@@ -29,7 +29,7 @@ class Login extends Base
      * @Apidoc\Returned("data", type="string", desc="用户token")
      */
     public function login(){
-        $code = input('code');
+        $code = input('code') ?: '';
         if(!$code){
             $this->error('授权码错误');
         }
@@ -47,11 +47,11 @@ class Login extends Base
      * 获取token
      *
      * @Apidoc\Method("POST")
-     * @Apidoc\Query("uid", type="string",require=true, desc="用户ID")
+     * @Apidoc\Param("uid", type="string",require=true, desc="用户ID")
      * @Apidoc\Returned("data", type="string", desc="用户token")
      */
     public function get_token(){
-        $uid = input('uid');
+        $uid = input('uid') ?: '';
         if(!$uid){
             $this->error('uid错误');
         }

+ 5 - 5
application/api/controller/Member.php

@@ -55,11 +55,11 @@ class Member extends Base
      */
     public function edit()
     {
-        $type = input('type');
-        $avatar = input('avatar');
-        $nickname = input('nickname');
-        $mobile = input('mobile');
-        $signature = input('signature');
+        $type = input('type') ?: 0;
+        $avatar = input('avatar') ?: '';
+        $nickname = input('nickname') ?: '';
+        $mobile = input('mobile') ?: '';
+        $signature = input('signature') ?: '';
 
         $data = [];
         switch ($type){