提交

application/api/controller/Goods.php

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

application/common/service/ApproveService.php

@@ -386,29 +386,32 @@ class ApproveService
                 }
             }
 
-            // 更新审批
-            $approve->status = $status;
-            $approve->approve_time = $approve_time;
-            $approve->remark = $remark;
-            $approve->time = $duration;
-            $approve->time_text = get_stay_time($duration);
-            $approve->save();
-
             // 更新审批申请
             if ($status == CommonConstant::STATUS_3) {
+                // 审批通过
+                // 审批流程批次小于审批次数 更新下一级审批状态
                 if ($approve['approve_flow'] < $info['approve_num']) {
-                    // 更新下一级审批状态
                     Approve::where(['info_id' => $approve['info_id'], 'approve_flow' => $approve['approve_flow'] + 1])->update(['status' => CommonConstant::STATUS_2, 'approve_time' => $approve_time]);
                 } else {
                     $info->status = $status;
                 }
-            } else {
-                $info->status = $status;
-                // 审批驳回 全部改为历史记录
+            }
+            if ($status == CommonConstant::STATUS_4) {
+                // 审批驳回
+                // 全部改为历史记录
                 Approve::where('info_id',$approve['info_id'])->update(['state' => CommonConstant::IS_WHO_1]);
+                $info->status = $status;
             }
             $info->cur_num = $info['cur_num'] + 1;
             $info->save();
+
+            // 更新审批
+            $approve->status = $status;
+            $approve->approve_time = $approve_time;
+            $approve->remark = $remark;
+            $approve->time = $duration;
+            $approve->time_text = get_stay_time($duration);
+            $approve->save();
             Db::commit();
         } catch (Exception $e) {
             except('出现错误：' . $e->getMessage(), 2, $e);

application/common/service/GoodsService.php

@@ -15,14 +15,25 @@ class GoodsService
      * 商品列表
      *
      * @param integer $category_id 二级分类ID
+     * @param string $search 搜索 商品名称
      * @return array
      **/
-    public static function get_list($category_id)
+    public static function get_list($category_id, $search)
     {
+        if (!$category_id || !!empty($search)) {
+            return [];
+        }
+
         $list = Goods::field('status,is_deleted,create_at', true)
-            ->where('goods_category_id', $category_id)
             ->where('status', CommonConstant::IS_WHO_1)
             ->where('is_deleted', CommonConstant::IS_DELETED_0)
+            ->where('goods_category_id', $category_id)
+            ->when($category_id > 0, function ($query) use ($category_id) {
+                $query->where('goods_category_id', $category_id);
+            })
+            ->when(!empty($search), function ($query) use ($search) {
+                $query->where('goods_name', 'LIKE', '%' . $search . '%');
+            })
             ->with([
                 'goodsStock'
             ])