From 462cab284acca0d05640c68dc587bfbc0261052c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 10 一月 2024 16:14:22 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 87 +++++++++++++++++++++++++++++--------------
1 files changed, 59 insertions(+), 28 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
index eeaf8a6..5508be2 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -3,13 +3,17 @@
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ReUtil;
+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.CardDeletionRequest;
+import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.response.CarEventDTO;
-import com.doumee.dao.business.MemberCardMapper;
+import com.doumee.dao.business.*;
import com.doumee.dao.business.join.MemberCardJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
@@ -21,9 +25,11 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.service.business.impl.hksync.HkSyncOrgUserServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.*;
@@ -37,15 +43,25 @@
*/
@Service
public class MemberCardServiceImpl implements MemberCardService {
-
+ @Autowired
+ private MemberRoleMapper memberRoleMapper;
+ @Autowired
+ private DeviceRoleMapper deviceRoleMapper;
+ @Autowired
+ private DeviceMapper deviceMapper;
+ @Autowired
+ private EmpowerMapper empowerMapper;
@Autowired
private MemberCardMapper memberCardMapper;
+ @Autowired
+ private MemberMapper memberMapper;
@Autowired
private MemberCardJoinMapper memberCardJoinMapper;
@Override
public Integer create(MemberCard memberCard) {
+ memberCard.setStatus(Constants.ONE);
memberCardMapper.insert(memberCard);
return memberCard.getId();
}
@@ -83,11 +99,15 @@
this.updateById(memberCard);
}
}
-
+ @Override
+ @Transactional(rollbackFor = {Exception.class, BusinessException.class})
public void updateRefundCard(MemberCard memberCard) {
- int i = memberCardMapper.updateById(memberCard);
- // 璋冪敤service 鍚屾鏇存柊娴峰悍閭ｈ竟鐨勫搴斿崱鐘舵�侊紝涔熸敼涓洪��鍗�
- if(i > 0){
+ MemberCard model = memberCardMapper.selectById(memberCard.getId());
+ memberCardMapper.updateById(memberCard);
+ dealMemberRoleEmpower(memberMapper.selectById(memberCard.getMemberId()));
+
+ BaseResponse response = HKService.cardDeletion(new CardDeletionRequest());
+ if(){
}
}
@@ -112,6 +132,16 @@
wrapper.lambda().and(param -> param.eq(MemberCard::getStatus,Constants.ZERO).
or().eq(MemberCard::getStatus,Constants.TWO));
return memberCardMapper.selectList(wrapper);
+ }
+
+ /**
+ * 鏇寸粏浜哄憳鍏ㄩ儴闂ㄧ鏉冮檺
+ * @param member
+ */
+ private void dealMemberRoleEmpower(Member member ) {
+ //澶勭悊鏂板鐨勪汉鍛樺崱鐗囨暟鎹紙涓庢捣搴峰悓姝ワ級
+ List<MemberCard> cards = HkSyncOrgUserServiceImpl.getNormalCardList(member,memberCardMapper);
+ HkSyncOrgUserServiceImpl.dealMemberRoleEmpowerDo(cards,member,deviceRoleMapper,empowerMapper,deviceMapper);
}
@Override
@@ -178,6 +208,7 @@
queryWrapper.selectAll(MemberCard.class)
.selectAs(Member::getName,MemberCard::getMemberName)
.selectAs(Member::getPhone,MemberCard::getMemberPhone)
+ .selectAs(Member::getType,MemberCard::getMemberType)
.selectAs(Company::getName,MemberCard::getCompanyName);
queryWrapper.like(Objects.nonNull(pageWrap.getModel().getCode()),MemberCard::getCode,pageWrap.getModel().getCode())
.eq(Objects.nonNull(pageWrap.getModel().getStatus()),MemberCard::getStatus,pageWrap.getModel().getStatus())
@@ -200,34 +231,34 @@
private List<MemberCard> getDataPackage(IPage<MemberCard> memberCardIPage) {
List<MemberCard> newDataList = new ArrayList<>();
memberCardIPage.getRecords().stream().forEach(obj->{
- if(null != obj.getType()) {
- if(Constants.equalsInteger(obj.getCardType(),Constants.ZERO)) {
- obj.setTypeName(Constants.Status.LW_FK.getDes());
- }else if(Constants.equalsInteger(obj.getCardType(),Constants.ONE)){
- obj.setTypeName(Constants.Status.PT_FK.getDes());
- }else if(Constants.equalsInteger(obj.getCardType(),Constants.TWO)){
- obj.setTypeName(Constants.Status.NB_FK.getDes());
- }
- }
- if(null != obj.getCardType()) {
- if(Constants.equalsInteger(obj.getCardType(),Constants.ZERO)) {
- obj.setCardTypeName(HKConstants.CardStatus.DISABLE.getName());
- }else if(Constants.equalsInteger(obj.getCardType(),Constants.ONE)) {
- obj.setCardTypeName(HKConstants.CardStatus.ENABLE.getName());
- }else if(Constants.equalsInteger(obj.getCardType(),Constants.TWO)) {
- obj.setCardTypeName(HKConstants.CardStatus.REFUNDCARD.getName());
- }else if(Constants.equalsInteger(obj.getCardType(),Constants.THREE)) {
- obj.setCardTypeName(HKConstants.CardStatus.LOSS.getName());
+ if(null != obj.getMemberType()) {
+ if(Constants.equalsInteger(obj.getMemberType(),Constants.ZERO)) {
+ obj.setMemberTypeName(Constants.Status.LW_FK.getDes());
+ }else if(Constants.equalsInteger(obj.getMemberType(),Constants.ONE)){
+ obj.setMemberTypeName(Constants.Status.PT_FK.getDes());
+ }else if(Constants.equalsInteger(obj.getMemberType(),Constants.TWO)){
+ obj.setMemberTypeName(Constants.Status.NB_FK.getDes());
}
}
if(null != obj.getStatus()) {
- if(Constants.equalsInteger(obj.getCardType(),Constants.ONE)) {
+ if(Constants.equalsInteger(obj.getStatus(),Constants.ZERO)) {
+ obj.setStatusName(HKConstants.CardStatus.DISABLE.getName());
+ }else if(Constants.equalsInteger(obj.getStatus(),Constants.ONE)) {
+ obj.setStatusName(HKConstants.CardStatus.ENABLE.getName());
+ }else if(Constants.equalsInteger(obj.getStatus(),Constants.TWO)) {
+ obj.setStatusName(HKConstants.CardStatus.REFUNDCARD.getName());
+ }else if(Constants.equalsInteger(obj.getStatus(),Constants.THREE)) {
+ obj.setStatusName(HKConstants.CardStatus.LOSS.getName());
+ }
+ }
+ if(null != obj.getMemberType()) {
+ if(Constants.equalsInteger(obj.getMemberType(),Constants.ONE)) {
obj.setCardTypeName(HKConstants.CardStatus.IC.getName());
- }else if(Constants.equalsInteger(obj.getCardType(),Constants.TWO)) {
+ }else if(Constants.equalsInteger(obj.getMemberType(),Constants.TWO)) {
obj.setCardTypeName(HKConstants.CardStatus.CPU.getName());
- }else if(Constants.equalsInteger(obj.getCardType(),Constants.THREE)) {
+ }else if(Constants.equalsInteger(obj.getMemberType(),Constants.THREE)) {
obj.setCardTypeName(HKConstants.CardStatus.YJLCARD.getName());
- }else if(Constants.equalsInteger(obj.getCardType(),Constants.FOUR)) {
+ }else if(Constants.equalsInteger(obj.getMemberType(),Constants.FOUR)) {
obj.setCardTypeName(HKConstants.CardStatus.MCARD.getName());
}
}
--
Gitblit v1.9.3