From 91a2131482a50fc11dd48228a766c28123a1a435 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 03 十一月 2023 16:19:21 +0800
Subject: [PATCH] # 空字符串判断
---
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 111 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 89 insertions(+), 22 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index ef5e369..80f821f 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -12,6 +12,7 @@
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -19,12 +20,14 @@
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.web.request.RegisterRequest;
+import com.doumee.dao.business.web.request.WxPhoneRequest;
import com.doumee.dao.business.web.response.AccountResponse;
import com.doumee.dao.business.web.response.HomeResponse;
import com.doumee.dao.business.web.response.UserResponse;
import com.doumee.service.business.MemberService;
import me.chanjar.weixin.common.error.WxErrorException;
import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,6 +59,36 @@
}
@Override
+ public String createManageMember(Member member) {
+ LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ QueryWrapper<Member> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .eq(Member::getType,Constants.ONE)
+ .eq(Member::getCardNo,member.getCardNo());
+ Integer integer = memberMapper.selectCount(wrapper);
+
+ if (integer > 0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍗″彿瀛樺湪閲嶅");
+ }
+ Member insert = new Member();
+ insert.setCreateDate(new Date());
+ insert.setCreator(principal.getId());
+ insert.setEditDate(new Date());
+ insert.setEditor(principal.getId());
+ insert.setIsdeleted(Constants.ZERO);
+ insert.setName(member.getName());
+ insert.setNickname(member.getNickname());
+ insert.setStatus(member.getStatus());
+ insert.setRegisterDate(new Date());
+ insert.setCardNo(member.getCardNo());
+ insert.setType(Constants.ONE);
+ memberMapper.insert(insert);
+ return insert.getId();
+ }
+
+ @Override
public void deleteById(String id) {
memberMapper.deleteById(id);
}
@@ -80,6 +113,29 @@
}
@Override
+ public void update(Member member) {
+
+ QueryWrapper<Member> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .eq(Member::getType,Constants.ONE)
+ .eq(Member::getCardNo,member.getCardNo());
+ Integer integer = memberMapper.selectCount(wrapper);
+ if (integer > 0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍗″彿瀛樺湪閲嶅");
+ }
+ LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Member update = new Member();
+ update.setId(member.getId());
+ update.setName(member.getName());
+ update.setStatus(member.getStatus());
+ update.setEditDate(new Date());
+ update.setEditor(principal.getId());
+ memberMapper.updateById(member);
+
+ }
+
+ @Override
public void updateByIdInBatch(List<Member> members) {
if (CollectionUtils.isEmpty(members)) {
return;
@@ -97,7 +153,7 @@
@Override
public Member findOne(Member member) {
QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
- return memberMapper.selectOne(wrapper);
+ return memberMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
@@ -105,7 +161,7 @@
QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
return memberMapper.selectList(wrapper);
}
-
+
@Override
public PageData<Member> findPage(PageWrap<Member> pageWrap) {
IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -194,6 +250,23 @@
return PageData.from(memberMapper.selectPage(page, queryWrapper));
}
+
+ @Override
+ public PageData<Member> findManagerMemberPage(PageWrap<Member> pageWrap) {
+
+ IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ QueryWrapper<Member> queryWrapper = new QueryWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ if (pageWrap.getModel().getName() != null) {
+ queryWrapper.lambda().like(Member::getName, pageWrap.getModel().getName());
+ }
+ if (pageWrap.getModel().getCardNo() != null) {
+ queryWrapper.lambda().like(Member::getCardNo, pageWrap.getModel().getCardNo());
+ }
+ queryWrapper.lambda().eq(Member::getType, Constants.ONE);
+ return PageData.from(memberMapper.selectPage(page, queryWrapper));
+ }
+
@Override
public long count(Member member) {
QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
@@ -255,47 +328,42 @@
if(Objects.isNull(member)){
//鏂板鐢ㄦ埛 闇�瑕佽繘琛岀敤鎴风粦瀹氭墜鏈哄彿
member = new Member();
+ member.setId(Constants.getUUID());
member.setCreateDate(new Date());
member.setIsdeleted(Constants.ZERO);
member.setOpenid(openId);
member.setUnionid(unionId);
member.setType(Constants.ZERO);
+ member.setRegisterDate(new Date());
member.setOrigin(Constants.ZERO.toString());
member.setStatus(Constants.ZERO);
memberMapper.insert(member);
- accountResponse.setStatus(Constants.ONE);
- }else{
- UserResponse userResponse = getUserInfo(member.getId());
- if(StringUtils.isBlank(member.getPhone())){
- accountResponse.setStatus(Constants.ONE);
- }else{
- JwtPayLoad payLoad = new JwtPayLoad(userResponse.getId());
- accountResponse.setToken(JwtTokenUtil.generateToken(payLoad));
- }
- accountResponse.setUserResponse(userResponse);
}
-
+ UserResponse userResponse = getUserInfo(member.getId());
+ if(StringUtils.isBlank(member.getPhone())){
+ accountResponse.setStatus(Constants.ONE);
+ }
+ JwtPayLoad payLoad = new JwtPayLoad(member.getId());
+ accountResponse.setToken(JwtTokenUtil.generateToken(payLoad));
+ accountResponse.setSessionKey(session.getSessionKey());
+ accountResponse.setUserResponse(userResponse);
return accountResponse;
} catch (WxErrorException e) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
}
-
}
/**
* 瑙ｆ瀽寰俊鎵嬫満鍙�
- * @param memberId
- * @param encryptedData
- * @param iv
- * @param sessionKey
+ * @param wxPhoneRequest
* @return
*/
@Override
- public AccountResponse wxPhone(String memberId,String encryptedData, String iv,String sessionKey) {
+ public AccountResponse wxPhone(WxPhoneRequest wxPhoneRequest) {
try {
- Member member = memberMapper.selectById(memberId);
- WxMaPhoneNumberInfo userPhoneInfo = WxMiniConfig.wxMaService.getUserService().getPhoneNoInfo(sessionKey, encryptedData, iv);
+ Member member = memberMapper.selectById(wxPhoneRequest.getMemberId());
+ WxMaPhoneNumberInfo userPhoneInfo = WxMiniConfig.wxMaService.getUserService().getPhoneNoInfo(wxPhoneRequest.getSessionKey(), wxPhoneRequest.getEncryptedData(), wxPhoneRequest.getIv());
//鑾峰彇鎵嬫満鍙�
String mobile= userPhoneInfo.getPurePhoneNumber();
if(Objects.isNull(mobile)){
@@ -325,7 +393,6 @@
userResponse.setMobile(member.getPhone());
return userResponse;
}
-
}
--
Gitblit v1.9.3