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 | 57 +++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 41 insertions(+), 16 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 0665993..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 @@ -14,9 +14,11 @@ import com.doumee.core.utils.DESUtil; import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.ImageBase64Util; +import com.doumee.core.wx.wxPlat.WxPlatConstants; import com.doumee.core.wx.wxPlat.WxPlatNotice; import com.doumee.dao.business.DeviceRoleMapper; import com.doumee.dao.business.RetentionMapper; +import com.doumee.dao.business.WxNoticeConfigMapper; import com.doumee.dao.business.join.VisitsJoinMapper; import com.doumee.dao.business.model.DeviceRole; import com.doumee.dao.business.model.Member; @@ -40,14 +42,19 @@ public class HkSyncVisitServiceImpl extends HkSyncBaseServiceImpl { @Autowired private VisitsJoinMapper visitsMapper; + + + + @Autowired + private WxPlatNotice wxPlatNotice; + @Autowired + private WxNoticeConfigMapper wxNoticeConfigMapper; @Autowired private RetentionMapper retentionMapper; @Autowired private SystemDictDataBiz systemDictDataBiz; @Autowired private DeviceRoleMapper deviceRoleMapper; - @Autowired - private WxPlatNotice wxPlatNotice; /** * 鍚屾娴峰悍璁垮淇℃伅鏄惁宸茬绂荤姸鎬� */ @@ -112,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())); } } @@ -130,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())); @@ -187,18 +194,19 @@ // 瀵圭浉搴旂姸鎬佷笅鐨勬暟鎹繘琛屻�愬凡绛剧銆戝鐞� if(!Constants.equalsInteger(c.getStatus(),Constants.VisitStatus.signout)){ Visits update = new Visits(); - //宸插け鏁� + //宸茬绂� update.setStatus(Constants.VisitStatus.signout); update.setEditDate(date); update.setId(c.getId()); update.setInDate(DateUtil.getISO8601DateByStr2(data.getVisitStartTime())); update.setOutDate(DateUtil.getISO8601DateByStr2(data.getVisitEndTime())); + update.setOutInfo(model.getVisitorStatus().equals(5)?"杩囨湡鑷姩绛剧":"鏌ヨ宸茬绂�"); update.setRemark("宸茬绂�"); 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())); } } @@ -216,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())); @@ -294,7 +302,7 @@ return ; } Constants.DEALING_HK_VISIT =true; - String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() + String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode() +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode(); List<DeviceRole> roleList = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda() .eq(DeviceRole::getType, Constants.ONE)); @@ -311,10 +319,12 @@ // getUpdateModelByResponse(c,date,roleList,path); getUpdateModelByResponseIccm(c,date,roleList,path); visitsMapper.updateById(c); - if(Objects.isNull(c.getParentId())){ - wxPlatNotice.sendVisitAuditTemplateNotice(c, - systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_PREFIX).getCode(), - systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_AUDIT_VISIT).getCode()); + //缁欑敵璇蜂汉鍙戦�佸井淇″叕浼楀彿 涓嬪彂鏉冮檺澶辫触 + if(StringUtils.isNotBlank(c.getOpenid()) && Constants.equalsInteger(c.getStatus(),Constants.VisitStatus.xfFail)){ + wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz, + wxNoticeConfigMapper,c, WxPlatConstants.visitContent.visitApplyHkFail, + Arrays.asList(c.getOpenid().split(",")) + ); } } }catch (Exception e){ @@ -360,6 +370,7 @@ private void getUpdateModelByResponse( Visits c,Date date, List<DeviceRole> roleList,String path ) { String code = null; String id = null; + String recordid = null; String qrcode = null; String reson = ""; //鍙戣捣娴峰悍棰勭害鎺ュ彛 @@ -381,7 +392,8 @@ && response.getData().getAppointmentInfoList() !=null && response.getData().getAppointmentInfoList().size()>0)){ id =response.getData().getAppointmentInfoList().get(0).getOrderId(); - qrcode =response.getData().getAppointmentInfoList().get(0).getQRCode(); + qrcode =response.getData().getAppointmentInfoList().get(0).getVerificationCode(); +// qrcode =response.getData().getAppointmentInfoList().get(0).getQRCode(); } reson = response!=null?JSONObject.toJSONString(response):""; }else{ @@ -400,6 +412,7 @@ code =response!=null ?response.getCode():null; if(response!=null && response.getData()!=null){ id = response.getData().getOrderId(); + recordid = response.getData().getAppointRecordId(); qrcode =response.getData().getQRCode(); } reson = response!=null?JSONObject.toJSONString(response):""; @@ -407,6 +420,7 @@ if (code!= null && id!=null) { //娴峰悍涓嬪彂鎴愬姛 c.setHkId( id);//棰勭害鏍囪瘑 + c.setHkRecordId(recordid);//璁垮棰勭害璁板綍鏍囪瘑锛堢敤鎴峰彇娑堥绾︼級 c.setQrcode(qrcode); c.setRemark("涓嬪彂娴峰悍鎴愬姛锛�"); c.setStatus(Constants.VisitStatus.xfSuccess);//涓嬪彂娴峰悍鎴愬姛 @@ -421,6 +435,7 @@ public static void getUpdateModelByResponseIccm( Visits c,Date date, List<DeviceRole> roleList,String path ) { String code = null; String id = null; + String recordId = null; String qrcode = null; String reson = ""; //鍙戣捣娴峰悍棰勭害鎺ュ彛 @@ -442,7 +457,9 @@ && response.getData().getAppointmentInfoList() !=null && response.getData().getAppointmentInfoList().size()>0)){ id =response.getData().getOrderId(); - qrcode =response.getData().getAppointmentInfoList().get(0).getQRCode(); + recordId = response.getData().getAppointRecordId(); +// qrcode =response.getData().getAppointmentInfoList().get(0).getQRCode(); + qrcode =response.getData().getAppointmentInfoList().get(0).getVerificationCode(); } reson = response!=null?JSONObject.toJSONString(response):""; }else{ @@ -461,6 +478,7 @@ code =response!=null ?response.getCode():null; if(response!=null && response.getData()!=null){ id = response.getData().getOrderId(); + recordId = response.getData().getAppointRecordId(); qrcode =response.getData().getQRCode(); } reson = response!=null?JSONObject.toJSONString(response):""; @@ -468,6 +486,7 @@ if (code!= null && id!=null) { //娴峰悍涓嬪彂鎴愬姛 c.setHkId( id);//棰勭害鏍囪瘑 + c.setHkRecordId(recordId); c.setQrcode(qrcode); c.setRemark("涓嬪彂娴峰悍鎴愬姛锛�"); c.setStatus(Constants.VisitStatus.xfSuccess);//涓嬪彂娴峰悍鎴愬姛 @@ -659,7 +678,10 @@ } info.setPhoneNo(c.getPhone()); info.setPlateNo(c.getCarNos()); - info.setGender(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())); @@ -707,7 +729,10 @@ } info.setPhoneNo(c.getPhone()); info.setPlateNo(c.getCarNos()); - info.setGender(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