From eb4463934f2c7861a502dd51320fb66009f65589 Mon Sep 17 00:00:00 2001 From: lishuai <260038442@qq.com> Date: 星期一, 08 一月 2024 14:31:32 +0800 Subject: [PATCH] 配置信息对接调整提交 --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 52 +++++++++++++++++++++++++--------------------------- 1 files changed, 25 insertions(+), 27 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..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 @@ -46,6 +46,7 @@ @Override public Integer create(MemberCard memberCard) { + memberCard.setStatus(Constants.ONE); memberCardMapper.insert(memberCard); return memberCard.getId(); } @@ -85,11 +86,7 @@ } public void updateRefundCard(MemberCard memberCard) { - int i = memberCardMapper.updateById(memberCard); - // 璋冪敤service 鍚屾鏇存柊娴峰悍閭h竟鐨勫搴斿崱鐘舵�侊紝涔熸敼涓洪��鍗� - if(i > 0){ - - } + memberCardMapper.updateById(memberCard); } @Override @@ -178,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()) @@ -200,34 +198,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