From d7e663d304a2ccb565a24362b116ddaa9da9941a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 09 一月 2024 13:56:43 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 2 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 58a2b9c..c778d4a 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,14 +3,19 @@
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ReUtil;
+import com.doumee.core.haikang.model.HKConstants;
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.join.MemberCardJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberCard;
+import com.doumee.dao.business.model.Retention;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.MemberCardService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -21,8 +26,9 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛⊿ervice瀹炵幇
@@ -40,6 +46,7 @@
@Override
public Integer create(MemberCard memberCard) {
+ memberCard.setStatus(Constants.ONE);
memberCardMapper.insert(memberCard);
return memberCard.getId();
}
@@ -78,6 +85,10 @@
}
}
+ public void updateRefundCard(MemberCard memberCard) {
+ memberCardMapper.updateById(memberCard);
+ }
+
@Override
public MemberCard findById(Integer id) {
return memberCardMapper.selectById(id);
@@ -92,6 +103,11 @@
@Override
public List<MemberCard> findList(MemberCard memberCard) {
QueryWrapper<MemberCard> wrapper = new QueryWrapper<>(memberCard);
+ wrapper.lambda().eq(MemberCard::getIsdeleted, Constants.ZERO);
+ wrapper.lambda().eq(MemberCard::getHkStatus, Constants.ONE);
+ // 鍚敤鍜岄��鍗＄殑鍗″彿
+ wrapper.lambda().and(param -> param.eq(MemberCard::getStatus,Constants.ZERO).
+ or().eq(MemberCard::getStatus,Constants.TWO));
return memberCardMapper.selectList(wrapper);
}
@@ -159,6 +175,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())
@@ -166,6 +183,9 @@
.like(number,Member::getPhone,pageWrap.getModel().getKeyWords())
.like((b||hasWord),Member::getName,pageWrap.getModel().getKeyWords());
IPage<MemberCard> memberCardIPage = memberCardJoinMapper.selectJoinPage(page, MemberCard.class,queryWrapper);
+ if(null != memberCardIPage && memberCardIPage.getRecords().size() > 0) {
+ memberCardIPage.setRecords(getDataPackage(memberCardIPage));
+ }
return PageData.from(memberCardIPage);
}
@@ -174,4 +194,43 @@
QueryWrapper<MemberCard> wrapper = new QueryWrapper<>(memberCard);
return memberCardMapper.selectCount(wrapper);
}
+
+ private List<MemberCard> getDataPackage(IPage<MemberCard> memberCardIPage) {
+ List<MemberCard> newDataList = new ArrayList<>();
+ memberCardIPage.getRecords().stream().forEach(obj->{
+ 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.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.getMemberType(),Constants.TWO)) {
+ obj.setCardTypeName(HKConstants.CardStatus.CPU.getName());
+ }else if(Constants.equalsInteger(obj.getMemberType(),Constants.THREE)) {
+ obj.setCardTypeName(HKConstants.CardStatus.YJLCARD.getName());
+ }else if(Constants.equalsInteger(obj.getMemberType(),Constants.FOUR)) {
+ obj.setCardTypeName(HKConstants.CardStatus.MCARD.getName());
+ }
+ }
+ newDataList.add(obj);
+ });
+ return newDataList;
+ }
}
--
Gitblit v1.9.3