From e4a06e0730dc0aa6ced97cbb3362d6b8ef473d39 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 15:56:34 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 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 0665993..e85c595 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
@@ -14,9 +14,11 @@
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.ImageBase64Util;
+import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.DeviceRoleMapper;
import com.doumee.dao.business.RetentionMapper;
+import com.doumee.dao.business.WxNoticeConfigMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.DeviceRole;
import com.doumee.dao.business.model.Member;
@@ -40,14 +42,19 @@
public class HkSyncVisitServiceImpl extends HkSyncBaseServiceImpl {
@Autowired
private VisitsJoinMapper visitsMapper;
+
+
+
+ @Autowired
+ private WxPlatNotice wxPlatNotice;
+ @Autowired
+ private WxNoticeConfigMapper wxNoticeConfigMapper;
@Autowired
private RetentionMapper retentionMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
private DeviceRoleMapper deviceRoleMapper;
- @Autowired
- private WxPlatNotice wxPlatNotice;
/**
* 鍚屾娴峰悍璁垮淇℃伅鏄惁宸茬绂荤姸鎬�
*/
@@ -187,12 +194,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);
@@ -294,7 +302,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));
@@ -311,10 +319,13 @@
// 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());
+ //缁欑敵璇蜂汉鍙戦�佸井淇″叕浼楀彿 涓嬪彂鏉冮檺澶辫触
+ 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(","))
+ );
}
}
}catch (Exception e){
@@ -381,7 +392,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{
@@ -442,7 +454,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