From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 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..af95672 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.*;
@@ -293,7 +294,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 +311,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 +376,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 +438,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