From ea0698e0384aa60d3e2bad7da5efd7ea4fb8cf71 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 08 五月 2025 15:39:42 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 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 e85c595..bd6cf76 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 @@ -323,7 +323,6 @@ if(StringUtils.isNotBlank(c.getOpenid()) && Constants.equalsInteger(c.getStatus(),Constants.VisitStatus.xfFail)){ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz, wxNoticeConfigMapper,c, WxPlatConstants.visitContent.visitApplyHkFail, - systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(), Arrays.asList(c.getOpenid().split(",")) ); } @@ -371,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 = ""; //鍙戣捣娴峰悍棰勭害鎺ュ彛 @@ -412,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):""; @@ -419,6 +420,7 @@ if (code!= null && id!=null) { //娴峰悍涓嬪彂鎴愬姛 c.setHkId( id);//棰勭害鏍囪瘑 + c.setHkRecordId(recordid);//璁垮棰勭害璁板綍鏍囪瘑锛堢敤鎴峰彇娑堥绾︼級 c.setQrcode(qrcode); c.setRemark("涓嬪彂娴峰悍鎴愬姛锛�"); c.setStatus(Constants.VisitStatus.xfSuccess);//涓嬪彂娴峰悍鎴愬姛 @@ -433,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 = ""; //鍙戣捣娴峰悍棰勭害鎺ュ彛 @@ -454,6 +457,7 @@ && response.getData().getAppointmentInfoList() !=null && response.getData().getAppointmentInfoList().size()>0)){ id =response.getData().getOrderId(); + recordId = response.getData().getAppointRecordId(); // qrcode =response.getData().getAppointmentInfoList().get(0).getQRCode(); qrcode =response.getData().getAppointmentInfoList().get(0).getVerificationCode(); } @@ -474,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):""; @@ -481,6 +486,7 @@ if (code!= null && id!=null) { //娴峰悍涓嬪彂鎴愬姛 c.setHkId( id);//棰勭害鏍囪瘑 + c.setHkRecordId(recordId); c.setQrcode(qrcode); c.setRemark("涓嬪彂娴峰悍鎴愬姛锛�"); c.setStatus(Constants.VisitStatus.xfSuccess);//涓嬪彂娴峰悍鎴愬姛 @@ -672,7 +678,7 @@ } info.setPhoneNo(c.getPhone()); info.setPlateNo(c.getCarNos()); - info.setGender(c.getSex()+""); + info.setGender(c.getSex()==null?"1":c.getSex()+""); if(Constants.equalsInteger(c.getIdcardType(),Constants.ZERO)){ info.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+""); info.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo())); @@ -721,6 +727,7 @@ info.setPhoneNo(c.getPhone()); info.setPlateNo(c.getCarNos()); info.setGender(c.getSex()+""); + info.setGender(c.getSex()==null?"1":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