From 48d06fac940e6f28d599eb7fbf05c2cce41ecb30 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 十月 2025 10:35:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java
index fee5ff9..7900f83 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java
@@ -72,6 +72,7 @@
if(Constants.equalsInteger(jkIccard.getStatus(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚敤鏁版嵁鏃犳硶杩涜鍒犻櫎锛�");
}
+ jkIccardMapper.update(null,new UpdateWrapper<JkIccard>().lambda().set(JkIccard::getIsdeleted,Constants.ONE).eq(JkIccard::getId,jkIccard.getId()));
}
@Override
@@ -150,6 +151,7 @@
.leftJoin(Member.class,Member::getId,JkIccard::getMemberId)
.eq(JkIccard::getIsdeleted,Constants.ZERO)
.eq(Objects.nonNull(model.getStatus()),JkIccard::getStatus,model.getStatus())
+ .eq(Objects.nonNull(model.getUserType()),JkIccard::getUserType,model.getUserType())
.like(StringUtils.isNotBlank(model.getCode()),JkIccard::getCode,model.getCode())
.like(StringUtils.isNotBlank(model.getMemberName()),Member::getName,model.getMemberName())
.orderByDesc(JkIccard::getCreateDate)
@@ -178,4 +180,20 @@
}
+ @Override
+ public Integer getMemberIdByCode(String code){
+ JkIccard jkIccard = jkIccardMapper.selectOne(new QueryWrapper<JkIccard>().lambda()
+ .eq(JkIccard::getIsdeleted,Constants.ZERO)
+ .eq(JkIccard::getStatus,Constants.ONE)
+ .eq(JkIccard::getCode,code)
+ .last(" limit 1 ")
+ );
+ if(Objects.isNull(jkIccard)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ return jkIccard.getMemberId();
+
+ }
+
+
}
--
Gitblit v1.9.3