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 | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
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 c8d3d1a..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
@@ -6,6 +6,7 @@
import com.github.pagehelper.PageInfo;
import com.xzx.gc.common.exception.RestException;
import com.xzx.gc.entity.JhyInfo;
+import com.xzx.gc.user.dto.ExamineJwyDto;
import com.xzx.gc.user.dto.JhyApplyDto;
import com.xzx.gc.user.dto.JhyInfoListDto;
import com.xzx.gc.user.mapper.JhyInfoMapper;
@@ -36,6 +37,8 @@
throw new RestException(-3, "手机号/身份证号已注册集物员");
}
+ jhyInfoMapper.deleteByUserId(applyDto.getUserId());
+
JhyInfo jhyInfo = new JhyInfo();
BeanUtil.copyProperties(applyDto, jhyInfo);
jhyInfo.setCreatedTime(new Date());
@@ -51,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) {
@@ -72,4 +83,18 @@
data.put("code", 0);
return data;
}
+
+ public void examineJwy(ExamineJwyDto model) {
+ long id = model.getId();
+ JhyInfo jhyInfo = jhyInfoMapper.selectByPrimaryKey(id);
+ Integer type = model.getType();
+ if(1 == type){
+ jhyInfo.setStatus(2);
+ jhyInfo.setIsJhy(1+"");
+ }else if(2 == type){
+ jhyInfo.setStatus(3);
+ jhyInfo.setIsJhy(2+"");
+ }
+ jhyInfoMapper.updateByPrimaryKey(jhyInfo);
+ }
}
--
Gitblit v1.9.1