From b92ca63c89b74404c3684f18c734d83531a9dd3f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 06 三月 2025 16:01:45 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 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 55d3f76..eb3ebc8 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
@@ -57,6 +57,7 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.CellType;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -125,6 +126,10 @@
private TmsService tmsService;
@Autowired
private SystemUserMapper systemUserMapper;
+ @Autowired
+ private CarsMapper carsMapper;
+ @Autowired
+ private ParkBookMapper parkBookMapper;
@Autowired
@Lazy
@@ -578,11 +583,13 @@
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public void deleteById(Integer id,LoginUserInfo loginUserInfo) {
+
+ Date date =new Date();
Member member=new Member();
member.setId(id);
member.setIsdeleted(Constants.ONE);
member.setEditor(loginUserInfo.getId());
- member.setEditDate(new Date());
+ member.setEditDate(date);
member.setHkStatus(Constants.ZERO);
member.setRemark("浜哄憳宸插垹闄わ紝绛夊緟鍒犻櫎闂ㄧ鏉冮檺");
memberMapper.updateById(member);
@@ -596,8 +603,30 @@
.set(SystemUser::getUpdateUser,member.getEditor())
.set(SystemUser::getUpdateTime,member.getEditDate())
);
-
saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member));
+ List<Cars> carsList = carsMapper.selectList(new QueryWrapper<Cars>().lambda()
+ .eq(Cars::getMemberId,member.getId())
+ .eq(Cars::getIsdeleted,Constants.ONE)
+ .eq(Cars::getAuthStatus,Constants.ONE)//宸叉巿鏉冨寘鏈熺殑杞﹁締
+ );
+ if ((carsMapper!=null && carsList.size()>0)){
+ for(Cars car :carsList){
+ if(Constants.equalsInteger(car.getAuthStatus(),Constants.ZERO)){
+ Cars model = new Cars();
+ carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
+ .eq(Cars::getId,car.getId())
+ .set(Cars::getStartTime,null)
+ .set(Cars::getEndTime,null)
+ .set(Cars::getAuthTimeType,null)
+ .set(Cars::getAuthStatus,Constants.ZERO)
+ .set(Cars::getEditDate,model.getEditDate())
+ .set(Cars::getEdirot,model.getEdirot())
+ );
+ //鍒犻櫎宸叉巿鏉冧笅鍙戠殑鍖呮湡鎺堟潈
+ CarsServiceImpl.dealCancelBookBiz(car.getCode(),date,parkBookMapper);
+ }
+ }
+ }
}
@@ -967,7 +996,7 @@
public static void saveUserActionBiz(Member updateMember,LoginUserInfo user, Constants.UserActionType type,UserActionJoinMapper userActionMapper,String content) {
updateMember.setEditDate(updateMember.getEditDate()==null?new Date():updateMember.getEditDate());
- UserAction userAction=new UserAction();
+ UserAction userAction=new UserAction();
userAction.setIsdeleted(Constants.ZERO);
userAction.setCreateDate(updateMember.getEditDate());
userAction.setCreator(updateMember.getEditor());
@@ -1799,7 +1828,7 @@
SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
.eq(SystemUser::getOpenid,openId)
.in(SystemUser::getType,Constants.memberType.internal)
- .eq(SystemUser::getDeleted,Boolean.FALSE)
+ .eq(SystemUser::getDeleted,Constants.ZERO)
.last(" limit 1 "));
//闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
if(!Objects.isNull(user)){
@@ -1828,7 +1857,7 @@
SystemUser user = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
.eq(SystemUser::getOpenid,openId)
.in(SystemUser::getType,Constants.memberType.internal,Constants.memberType.driver)
- .eq(SystemUser::getDeleted,Boolean.FALSE)
+ .eq(SystemUser::getDeleted,Constants.ZERO)
.last(" limit 1 "));
//闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
if(!Objects.isNull(user)){
@@ -1860,7 +1889,7 @@
.eq(SystemUser::getOpenid,openId)
.eq(SystemUser::getType,source)
// .eq(Objects.nonNull(source)&&Constants.equalsInteger(source,Constants.TWO),SystemUser::getType,source)
- .eq(SystemUser::getDeleted,Boolean.FALSE)
+ .eq(SystemUser::getDeleted,Constants.ZERO)
.last(" limit 1 "));
//闈炶瀹㈢敤鎴� 杩涜鍒ゆ柇鏄惁瀛樺湪鐢ㄦ埛
if(!Objects.isNull(user)){
@@ -2048,7 +2077,7 @@
ExcelImporter ie = null;
List<MemberImport> dataList =null;
try {
- ie = new ExcelImporter(file,1,0);
+ ie = new ExcelImporter(file,1,0, CellType.STRING); // 纭繚鍗曞厓鏍肩被鍨嬩负瀛楃涓�);
dataList = ie.getDataList(MemberImport.class,null);
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.3