From 0741dc7f25811ea2acb4127fc43d1dc9a802221c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Jun 2021 21:37:07 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-user/src/main/java/com/xzx/gc/user/controller/ApiJhyInfoController.java |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/gc-user/src/main/java/com/xzx/gc/user/controller/ApiJhyInfoController.java b/gc-user/src/main/java/com/xzx/gc/user/controller/ApiJhyInfoController.java
index 2655032..0d86013 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/controller/ApiJhyInfoController.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/controller/ApiJhyInfoController.java
@@ -45,12 +45,30 @@
     @ApiOperation("是否集货员")
     @GetMapping(value = "/jhy/isJhy")
     public JsonResult<Map<String, Object>> isJhy(HttpServletRequest request) {
-        boolean flag = jhyInfoService.isJhy(getUserId(request));
+        int flag = jhyInfoService.isJhy(getUserId(request));
         Map<String, Object> map = new HashMap<>();
-        map.put("flag", flag);
-        map.put("icon", "../../images/icon_entrance.png");
-        map.put("name", "成为集物员");
-        map.put("path", "../../subcontract1/become_sgm/become_sgm");
+        map.put("flag", flag == 1);
+        switch (flag) {
+            case 0:
+                map.put("icon", "../../images/icon_entrance.png");
+                map.put("name", "成为集物员");
+                map.put("path", "../../subcontract1/become_sgm/become_sgm");
+                break;
+            case 1:
+                map.put("icon", "../../images/icon_team.png");
+                map.put("name", "集物员订单列表");
+                map.put("path", "../../collectPersonnel/GCOrderForm/index");
+                break;
+            case 2:
+                map.put("icon", "../../images/icon_entrance.png");
+                map.put("name", "集物员待审核");
+                map.put("path", "../../pages/home/home");
+                break;
+            default:
+                map.put("icon", "../../images/icon_entrance.png");
+                map.put("name", "成为集物员");
+                map.put("path", "../../subcontract1/become_sgm/become_sgm");
+        }
         return JsonResult.success(map);
     }
 }

--
Gitblit v1.9.1