From df70441cb1dd210a0df4f0c0eaefc09c14d72a14 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 30 九月 2024 17:17:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
index af8d16d..69bdaa3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -5,7 +5,6 @@
import cn.hutool.core.util.ReUtil;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.CardBingdingRequest;
import com.doumee.core.haikang.model.param.request.CardDeletionRequest;
@@ -66,6 +65,9 @@
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer create(MemberCard memberCard) {
LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(userInfo == null){
+ userInfo = memberCard.getLoginUserInfo();
+ }
if(Objects.isNull(memberCard.getMemberId())
|| StringUtils.isBlank(memberCard.getCode())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -83,8 +85,8 @@
}
CardBingdingRequest param = new CardBingdingRequest();
if(member.getStartTime() !=null && member.getEndTime()!=null){
- param.setStartDate(DateUtil.getISO8601Timestamp(member.getStartTime()));
- param.setEndDate(DateUtil.getISO8601Timestamp(member.getEndTime()));
+ param.setStartDate(DateUtil.getShortTime(member.getStartTime()));
+ param.setEndDate(DateUtil.getShortTime(member.getEndTime()));
}
CardInfoRequest cr = new CardInfoRequest();
cr.setCardNo(memberCard.getCode());
@@ -137,8 +139,7 @@
*/
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
- public void updateByIdInBatch(List<MemberCard> memberCards,Integer type) {
- LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public void updateByIdInBatch(List<MemberCard> memberCards,Integer type,LoginUserInfo userInfo){
if (CollectionUtils.isEmpty(memberCards)) {
return;
}
--
Gitblit v1.9.3