From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期二, 12 三月 2019 16:29:55 +0800 Subject: [PATCH] 冲突提交 --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/ForbiddenUserIdentifyCodeServiceImpl.java | 91 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ForbiddenUserIdentifyCodeServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ForbiddenUserIdentifyCodeServiceImpl.java index 4441c3a..f838695 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ForbiddenUserIdentifyCodeServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ForbiddenUserIdentifyCodeServiceImpl.java @@ -13,6 +13,7 @@ import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException; import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService; import com.yeshi.fanli.util.StringUtil; +import com.yeshi.fanli.vo.user.ForbiddenUserIdentifyCodeVO; @Service public class ForbiddenUserIdentifyCodeServiceImpl implements ForbiddenUserIdentifyCodeService { @@ -62,4 +63,94 @@ forbiddenUserIdentifyCodeMapper.deleteByPrimaryKey(identifyCode.getId()); } + + @Override + public List<ForbiddenUserIdentifyCodeVO> listQuery(long start, int count, String key, Integer type) { + + List<ForbiddenUserIdentifyCodeVO> list = forbiddenUserIdentifyCodeMapper.listQuery(start, count, key, type); + if (list == null || list.size() == 0) { + return list; + } + + for (ForbiddenUserIdentifyCodeVO forbiddenUserIdentifyCodeVO: list) { + + String f_alipayAccount = forbiddenUserIdentifyCodeVO.getF_alipayAccount(); + if (f_alipayAccount != null && f_alipayAccount.trim().length() > 0) { + forbiddenUserIdentifyCodeVO.setAlipayAccountState(1); + } + + String f_phone = forbiddenUserIdentifyCodeVO.getF_phone(); + if (f_phone != null && f_phone.trim().length() > 0) { + forbiddenUserIdentifyCodeVO.setPhoneState(1); + } + + String f_taobaoUid = forbiddenUserIdentifyCodeVO.getF_taobaoUid(); + if (f_taobaoUid != null && f_taobaoUid.trim().length() > 0) { + forbiddenUserIdentifyCodeVO.setTaobaoUidState(1); + } + + String f_wxUnionId = forbiddenUserIdentifyCodeVO.getF_wxUnionId(); + if (f_wxUnionId != null && f_wxUnionId.trim().length() > 0) { + forbiddenUserIdentifyCodeVO.setWxUnionIdState(1); + } + } + + return list; + + } + + @Override + public long countQuery(String key, Integer type) { + return forbiddenUserIdentifyCodeMapper.countQuery(key, type); + } + + + @Override + public void saveForbiddenInfo(String identifyCode, Integer type, boolean state) throws ForbiddenUserIdentifyCodeException{ + + ForbiddenUserIdentifyCodeTypeEnum typeEnum = null; + + switch(type) { + case 1: // 寰俊璐﹀彿 + typeEnum = ForbiddenUserIdentifyCodeTypeEnum.wxUnionId; + break; + case 2: // 娣樺疂璐﹀彿 + typeEnum = ForbiddenUserIdentifyCodeTypeEnum.taobaoUid; + break; + case 3: // 鐢佃瘽鍙风爜 + typeEnum = ForbiddenUserIdentifyCodeTypeEnum.phone; + break; + case 4: // 鏀粯瀹濊处鍙� + typeEnum = ForbiddenUserIdentifyCodeTypeEnum.alipayAccount; + break; + default: + break; + } + + if (typeEnum == null) { + throw new ForbiddenUserIdentifyCodeException(1, "绫诲瀷涓嶅尮閰�"); + } + + ForbiddenUserIdentifyCode codeObject = listByTypeAndIdentifyCode(typeEnum ,identifyCode); + if (codeObject == null) { + // 灏佺璐︽埛 + if (state) { + codeObject = new ForbiddenUserIdentifyCode(); + codeObject.setType(typeEnum); + codeObject.setIdentifyCode(identifyCode); + codeObject.setEffective(state); + codeObject.setCreateTime(new Date()); + codeObject.setUpdateTime(new Date()); + + forbiddenUserIdentifyCodeMapper.insertSelective(codeObject); + } else { + throw new ForbiddenUserIdentifyCodeException(1, "鏈壘鍒板彲瑙e皝鍙风爜"); + } + } else { + codeObject.setEffective(state); + codeObject.setUpdateTime(new Date()); + forbiddenUserIdentifyCodeMapper.updateByPrimaryKeySelective(codeObject); + } + } + } -- Gitblit v1.8.0