From 3555e2dd2926ac2cd4b168b273699221d9eeb31f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 07 三月 2025 17:32:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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..1697d40 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
@@ -12,13 +12,14 @@
import com.doumee.core.haikang.model.param.request.CardInfoRequest;
import com.doumee.core.haikang.model.param.request.CardLossRequest;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.MemberCardJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
@@ -66,6 +67,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 +87,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 +141,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