From ecbdab9da9488cc58a1ac7064f9cffde4792fba4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 六月 2024 09:51:01 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 82ee127..4009bc7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -62,6 +62,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -124,6 +125,7 @@
private SystemUserMapper systemUserMapper;
@Autowired
+ @Lazy
private SmsEmailService smsEmailService;
@Value("${debug_model}")
@@ -378,6 +380,7 @@
if(model ==null ||Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ュ憳宸ヤ俊鎭笉瀛樺湪锛岃鍒锋柊椤甸潰閲嶈瘯锛�");
}
+ member.setSex(model.getSex());//榛樿鏄師鏉ョ殑鎬у埆
if (StringUtils.isNotBlank(member.getPhone()) ){
if ( !PhoneUtil.isPhone(member.getPhone())) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鐢佃瘽鍙风爜鏍煎紡鏈夎");
@@ -541,6 +544,7 @@
}
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void deleteById(Integer id,LoginUserInfo loginUserInfo) {
Member member=new Member();
member.setId(id);
@@ -550,6 +554,17 @@
member.setHkStatus(Constants.ZERO);
member.setRemark("浜哄憳宸插垹闄わ紝绛夊緟鍒犻櫎闂ㄧ鏉冮檺");
memberMapper.updateById(member);
+
+ //鍒櫎绯荤粺鐧婚檰璐︽埛
+ SystemUser user = new SystemUser();
+ user.setMemberId(id);
+ systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getMemberId,id)
+ .set(SystemUser::getDeleted,Boolean.TRUE)
+ .set(SystemUser::getUpdateUser,member.getEditor())
+ .set(SystemUser::getUpdateTime,member.getEditDate())
+ );
+
saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member));
}
@@ -596,7 +611,7 @@
//濡傛灉鍛樺伐淇℃伅涓嶅悎娉曠洿鎺ヨ烦杩�
continue;
}
- if(StringUtils.isNotBlank(member.getFaceId()) || !Constants.equalsInteger(member.getFaceStatus(),Constants.ONE)){
+ if(StringUtils.isBlank(member.getFaceId()) || !Constants.equalsInteger(member.getFaceStatus(),Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+member.getName()+"銆戠殑浜鸿劯淇℃伅涓嶆弧瓒虫巿鏉冩潯浠讹紝璇疯繑鍥炲畬鍠勫悗鍐嶈繘琛岃鎿嶄綔锛�");
}
member.setStartTime(memberRole.getStartTime());
@@ -788,8 +803,8 @@
}
for (Integer id:ids) {
Member member = memberMapper.selectById(id);
- if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
- member.setStatus(Constants.TWO);
+ if(!Objects.isNull(member)&&member.getStatus()==Constants.TWO){
+ member.setStatus(Constants.ZERO);//鎭㈠姝ｅ父鐘舵��
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
member.setAuthStatus(Constants.ZERO);//鏈巿鏉�
@@ -823,8 +838,8 @@
}
for (Integer id:ids) {
Member member = memberMapper.selectById(id);
- if(!Objects.isNull(member)&&member.getStatus()==Constants.ZERO){
- member.setStatus(Constants.ONE);//鎭㈠姝ｅ父鐘舵��
+ if(!Objects.isNull(member)&&member.getStatus()==Constants.TWO){
+ member.setStatus(Constants.ZERO);//鎭㈠姝ｅ父鐘舵��
member.setEditor(loginUserInfo.getId());
member.setEditDate(new Date());
member.setAuthStatus(Constants.ZERO);//鏈巿鏉�
@@ -1613,11 +1628,11 @@
String appSecret = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_SECRET).getCode();
String getTokenUrl = WXConstant.GET_USER_INFO_URL.replace("CODE", code)
.replace("APPID", appId).replace("SECRET", appSecret);
- JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true));
- String openId = null;
- if(!Objects.isNull(tokenJson.get("access_token"))){
- openId = tokenJson.getString("openid");
- }
+// JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true));
+ String openId = code;
+// if(!Objects.isNull(tokenJson.get("access_token"))){
+// openId = tokenJson.getString("openid");
+// }
// String openId = "12345";
WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
wxAuthorizeVO.setOpenid(openId);
@@ -2004,7 +2019,7 @@
Member member = new Member();
member.setCreateDate(new Date());
member.setIsdeleted(Constants.ZERO);
- member.setType(Constants.TWO);
+ member.setType(Constants.THREE);
member.setName(registerDriverDTO.getName());
member.setPhone(registerDriverDTO.getPhone());
member.setStatus(Constants.ZERO);
--
Gitblit v1.9.3