From 99b8fc4aedcb4a88d0649586d740b46781eced89 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 27 二月 2024 16:03:40 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java | 16 ++++++++++++----
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 3 +++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 6 +++---
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index 69379a3..38bacc3 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -205,6 +205,9 @@
@ApiModelProperty(value = "openid")
@ExcelColumn(name="openid")
private String openid;
+ @ApiModelProperty(value = "璁垮浜岀淮鐮�")
+ @ExcelColumn(name="璁垮浜岀淮鐮�")
+ private String qrcode;
@ApiModelProperty(value = "璁垮棰勭害鏂瑰紡锛�0鐧昏棰勭害 1鍏嶇櫥璁伴绾�", example = "1")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index b18377a..9b98e60 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -408,14 +408,14 @@
retention.setType(visits.getMemberType());
retention.setCompanyId(visits.getCompanyId());
retention.setCompanyName(visits.getCompanyName());
- retention.setEventCode(request.getEventType()+"");
+ retention.setEventCode(request.getSrcType()+"");
retention.setEventDate(retention.getCreateDate());
retention.setFaceImg(visits.getFaceImg());
retention.setImgurl(visits.getImgurl());
retention.setPhone(visits.getPhone());
retention.setMemberId(visits.getMemberId());
- retention.setDeviceName(request.getSrcName());
- retention.setDeviceIndex(request.getSrcIndex());
+// retention.setDeviceName(request.getSrcName());
+// retention.setDeviceIndex(request.getSrcIndex());
return retention;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
index 322d2e8..da073fe 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
@@ -230,6 +230,7 @@
private void getUpdateModelByResponse( Visits c,Date date,String type,List<DeviceRole> roleList,String path ) {
String code = null;
String id = null;
+ String qrcode = null;
//鍙戣捣娴峰悍棰勭害鎺ュ彛
if(StringUtils.equals(type,"0")){
//锛堥渶瑕佺櫥璁帮級
@@ -244,9 +245,12 @@
}
BaseResponse<VisitAppointmentResponse> response = HKService.visitAppiontment(request);
code =response!=null ?response.getCode():null;
- id = (response!=null && response.getData()!=null
+ if((response!=null && response.getData()!=null
&& response.getData().getAppointmentInfoList() !=null
- && response.getData().getAppointmentInfoList().size()>0)?response.getData().getAppointmentInfoList().get(0).getOrderId():null;
+ && response.getData().getAppointmentInfoList().size()>0)){
+ id =response.getData().getAppointmentInfoList().get(0).getOrderId();
+ qrcode =response.getData().getAppointmentInfoList().get(0).getQRCode();
+ }
}else{
//鍏嶇櫥璁�
VisitAppointmentMDJRequest request =getHkMDJRequestPara(c,roleList,path);
@@ -260,16 +264,20 @@
}
BaseResponse<VisitAppointmentMDJResponse> response = HKService.visitAppiontmentMDJ(request );
code =response!=null ?response.getCode():null;
- id = (response!=null && response.getData()!=null)?response.getData().getOrderId():null;
+ if(response!=null && response.getData()!=null){
+ id = response.getData().getOrderId();
+ qrcode =response.getData().getQRCode();
+ }
}
if (code!= null && id!=null) {
//娴峰悍涓嬪彂鎴愬姛
c.setHkId( id);//棰勭害鏍囪瘑
+ c.setQrcode(qrcode);
c.setRemark("涓嬪彂娴峰悍鎴愬姛锛併��"+type+"銆�");
c.setStatus(Constants.VisitStatus.xfSuccess);//涓嬪彂娴峰悍鎴愬姛
} else {
- //娴峰悍涓嬪彂鎴愬姛
+ //娴峰悍涓嬪彂澶辫触
c.setRemark("涓嬪彂娴峰悍澶辫触锛併��"+type+"銆�");
c.setStatus(Constants.VisitStatus.xfFail);//涓嬪彂娴峰悍澶辫触
}
--
Gitblit v1.9.3