From 4e2e52b766d87fc528d02bdebc1757c3dda8c596 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 二月 2025 09:22:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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 cb95fe3..8f2f689 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
@@ -187,12 +187,13 @@
                     // 瀵圭浉搴旂姸鎬佷笅鐨勬暟鎹繘琛屻�愬凡绛剧銆戝鐞�
                     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);
 
@@ -376,7 +377,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{
@@ -437,7 +439,8 @@
                     && response.getData().getAppointmentInfoList() !=null
                     && response.getData().getAppointmentInfoList().size()>0)){
                 id =response.getData().getOrderId();
-                qrcode =response.getData().getAppointmentInfoList().get(0).getQRCode();
+//                qrcode =response.getData().getAppointmentInfoList().get(0).getQRCode();
+                qrcode =response.getData().getAppointmentInfoList().get(0).getVerificationCode();
             }
             reson = response!=null?JSONObject.toJSONString(response):"";
         }else{

--
Gitblit v1.9.3