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 | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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 64f76a0..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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseListPageResponse;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.*;
@@ -186,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);
@@ -293,7 +295,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));
@@ -310,11 +312,6 @@
// 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());
- }
}
}catch (Exception e){
e.printStackTrace();
@@ -380,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{
@@ -441,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