From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期二, 14 十月 2025 16:34:22 +0800 Subject: [PATCH] 改bug --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java index bd6cf76..501af50 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java @@ -119,7 +119,7 @@ //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鏅�氳瀹級 retentionMapper.delete(new UpdateWrapper<Retention>().lambda() - .eq(Retention::getType,Constants.memberType.visitor) + .eq(Retention::getType,Constants.RetentionMemberType.fk) .eq(Retention::getMemberId,c.getMemberId())); } } @@ -137,7 +137,7 @@ visitsMapper.updateById(update); //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鏅�氳瀹級 retentionMapper.delete(new UpdateWrapper<Retention>().lambda() - .eq(Retention::getType,Constants.memberType.visitor) + .eq(Retention::getType,Constants.RetentionMemberType.fk) .eq(Retention::getMemberId,c.getMemberId())); //鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳 retentionMapper.insert(getRetentionModelByVisitRequest(c,update.getInDate())); @@ -206,7 +206,7 @@ //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鏅�氳瀹級 retentionMapper.delete(new UpdateWrapper<Retention>().lambda() - .eq(Retention::getType,Constants.memberType.visitor) + .eq(Retention::getType,Constants.RetentionMemberType.fk) .eq(Retention::getMemberId,c.getMemberId())); } } @@ -224,7 +224,7 @@ visitsMapper.updateById(update); //鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鏅�氳瀹級 retentionMapper.delete(new UpdateWrapper<Retention>().lambda() - .eq(Retention::getType,Constants.memberType.visitor) + .eq(Retention::getType,Constants.RetentionMemberType.fk) .eq(Retention::getMemberId,c.getMemberId())); //鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳 retentionMapper.insert(getRetentionModelByVisitRequest(c,update.getInDate())); @@ -678,7 +678,10 @@ } info.setPhoneNo(c.getPhone()); info.setPlateNo(c.getCarNos()); - info.setGender(c.getSex()==null?"1":c.getSex()+""); + info.setGender( "1" ); + if(Constants.equalsInteger(c.getSex(),Constants.ONE) ||Constants.equalsInteger(c.getSex(),Constants.TWO) ){ + info.setGender( c.getSex()+""); + } if(Constants.equalsInteger(c.getIdcardType(),Constants.ZERO)){ info.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+""); info.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo())); @@ -726,8 +729,10 @@ } info.setPhoneNo(c.getPhone()); info.setPlateNo(c.getCarNos()); - info.setGender(c.getSex()+""); - info.setGender(c.getSex()==null?"1":c.getSex()+""); + info.setGender( "1"); + if(Constants.equalsInteger(c.getSex(),Constants.ONE) ||Constants.equalsInteger(c.getSex(),Constants.TWO) ){ + info.setGender( c.getSex()+""); + } if(Constants.equalsInteger(c.getIdcardType(),Constants.ZERO)){ info.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+""); info.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo())); -- Gitblit v1.9.3