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/service/JhyInfoService.java | 14 +++++++++++---
gc-user/src/main/java/com/xzx/gc/user/controller/ApiJhyInfoController.java | 28 +++++++++++++++++++++++-----
gc-core/src/main/java/com/xzx/gc/entity/JhyInfo.java | 1 +
3 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/JhyInfo.java b/gc-core/src/main/java/com/xzx/gc/entity/JhyInfo.java
index c4f3209..afff5d5 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/JhyInfo.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/JhyInfo.java
@@ -38,4 +38,5 @@
*/
private Integer status;
public static final Integer CHECK_PASS = 2;
+ public static final Integer CHECK_REFUSE = 3;
}
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);
}
}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java b/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java
index 9f129a9..535a8a5 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java
@@ -54,13 +54,21 @@
return jhyInfo.getStatus();
}
- public boolean isJhy(String userId) {
+ public int isJhy(String userId) {
JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(userId);
if (jhyInfo == null) {
- return false;
+ return 0;
}
- return JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus());
+ if (JhyInfo.CHECK_REFUSE.equals(jhyInfo.getStatus())) {
+ return 0;
+ }
+
+ if (JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
+ return 1;
+ } else {
+ return 2;
+ }
}
public Map<String, Object> queryList(JhyInfoListDto jhyInfoListDto) {
--
Gitblit v1.9.1