配置信息对接调整提交

lishuai

2024-01-08 eb4463934f2c7861a502dd51320fb66009f65589

配置信息对接调整提交

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java

@@ -32,7 +32,7 @@

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码")
@@ -41,7 +41,7 @@

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是")
@@ -102,7 +102,7 @@

    @ApiModelProperty(value = "卡类型 1 IC卡 2 CPU卡  3远距离卡 4M卡 -- 前端新增传值写死")
    @ExcelColumn(name="卡类型 1 IC卡 2 CPU卡  3远距离卡 4M卡")
    private Integer cardType;
    private Integer type;

    @ApiModelProperty(value = "卡类型名称")
    @TableField(exist = false)
@@ -110,11 +110,13 @@

    @ApiModelProperty(value = "类型 0劳务访客 1普通访客  2内部人员", example = "1")
    @ExcelColumn(name="类型 0劳务访客 1普通访客  2内部人员")
    private Integer type;
    @TableField(exist = false)
    private Integer memberType;

    @ApiModelProperty(value = "类型 0劳务访客 1普通访客  2内部人员", example = "1")
    @ExcelColumn(name="类型 0劳务访客 1普通访客  2内部人员")
    private String typeName;
    @TableField(exist = false)
    private String memberTypeName;

    @ApiModelProperty(value = "关键字")
    @TableField(exist = false)

 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 同步更新海康那边的对应卡状态，也改为退卡
        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());
                }
            }