From 109d785b5b30dc28fd9a106f0dcbb7fd45526810 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 16:25:43 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 e85c595..501af50 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
@@ -119,7 +119,7 @@
//鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鏅�氳瀹級
retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
- .eq(Retention::getType,Constants.memberType.visitor)
+ .eq(Retention::getType,Constants.RetentionMemberType.fk)
.eq(Retention::getMemberId,c.getMemberId()));
}
}
@@ -137,7 +137,7 @@
visitsMapper.updateById(update);
//鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鏅�氳瀹級
retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
- .eq(Retention::getType,Constants.memberType.visitor)
+ .eq(Retention::getType,Constants.RetentionMemberType.fk)
.eq(Retention::getMemberId,c.getMemberId()));
//鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
retentionMapper.insert(getRetentionModelByVisitRequest(c,update.getInDate()));
@@ -206,7 +206,7 @@
//鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鏅�氳瀹級
retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
- .eq(Retention::getType,Constants.memberType.visitor)
+ .eq(Retention::getType,Constants.RetentionMemberType.fk)
.eq(Retention::getMemberId,c.getMemberId()));
}
}
@@ -224,7 +224,7 @@
visitsMapper.updateById(update);
//鍏堝垹闄ゅ師鏈夌殑鍦ㄥ満浜哄憳(鏅�氳瀹級
retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
- .eq(Retention::getType,Constants.memberType.visitor)
+ .eq(Retention::getType,Constants.RetentionMemberType.fk)
.eq(Retention::getMemberId,c.getMemberId()));
//鍐嶆彃鍏ユ渶鏂扮殑鍦ㄥ巶浜哄憳
retentionMapper.insert(getRetentionModelByVisitRequest(c,update.getInDate()));
@@ -323,7 +323,6 @@
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(","))
);
}
@@ -371,6 +370,7 @@
private void getUpdateModelByResponse( Visits c,Date date, List<DeviceRole> roleList,String path ) {
String code = null;
String id = null;
+ String recordid = null;
String qrcode = null;
String reson = "";
//鍙戣捣娴峰悍棰勭害鎺ュ彛
@@ -412,6 +412,7 @@
code =response!=null ?response.getCode():null;
if(response!=null && response.getData()!=null){
id = response.getData().getOrderId();
+ recordid = response.getData().getAppointRecordId();
qrcode =response.getData().getQRCode();
}
reson = response!=null?JSONObject.toJSONString(response):"";
@@ -419,6 +420,7 @@
if (code!= null && id!=null) {
//娴峰悍涓嬪彂鎴愬姛
c.setHkId( id);//棰勭害鏍囪瘑
+ c.setHkRecordId(recordid);//璁垮棰勭害璁板綍鏍囪瘑锛堢敤鎴峰彇娑堥绾︼級
c.setQrcode(qrcode);
c.setRemark("涓嬪彂娴峰悍鎴愬姛锛�");
c.setStatus(Constants.VisitStatus.xfSuccess);//涓嬪彂娴峰悍鎴愬姛
@@ -433,6 +435,7 @@
public static void getUpdateModelByResponseIccm( Visits c,Date date, List<DeviceRole> roleList,String path ) {
String code = null;
String id = null;
+ String recordId = null;
String qrcode = null;
String reson = "";
//鍙戣捣娴峰悍棰勭害鎺ュ彛
@@ -454,6 +457,7 @@
&& response.getData().getAppointmentInfoList() !=null
&& response.getData().getAppointmentInfoList().size()>0)){
id =response.getData().getOrderId();
+ recordId = response.getData().getAppointRecordId();
// qrcode =response.getData().getAppointmentInfoList().get(0).getQRCode();
qrcode =response.getData().getAppointmentInfoList().get(0).getVerificationCode();
}
@@ -474,6 +478,7 @@
code =response!=null ?response.getCode():null;
if(response!=null && response.getData()!=null){
id = response.getData().getOrderId();
+ recordId = response.getData().getAppointRecordId();
qrcode =response.getData().getQRCode();
}
reson = response!=null?JSONObject.toJSONString(response):"";
@@ -481,6 +486,7 @@
if (code!= null && id!=null) {
//娴峰悍涓嬪彂鎴愬姛
c.setHkId( id);//棰勭害鏍囪瘑
+ c.setHkRecordId(recordId);
c.setQrcode(qrcode);
c.setRemark("涓嬪彂娴峰悍鎴愬姛锛�");
c.setStatus(Constants.VisitStatus.xfSuccess);//涓嬪彂娴峰悍鎴愬姛
@@ -672,7 +678,10 @@
}
info.setPhoneNo(c.getPhone());
info.setPlateNo(c.getCarNos());
- info.setGender(c.getSex()+"");
+ info.setGender( "1" );
+ if(Constants.equalsInteger(c.getSex(),Constants.ONE) ||Constants.equalsInteger(c.getSex(),Constants.TWO) ){
+ info.setGender( c.getSex()+"");
+ }
if(Constants.equalsInteger(c.getIdcardType(),Constants.ZERO)){
info.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+"");
info.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));
@@ -720,7 +729,10 @@
}
info.setPhoneNo(c.getPhone());
info.setPlateNo(c.getCarNos());
- info.setGender(c.getSex()+"");
+ info.setGender( "1");
+ if(Constants.equalsInteger(c.getSex(),Constants.ONE) ||Constants.equalsInteger(c.getSex(),Constants.TWO) ){
+ info.setGender( c.getSex()+"");
+ }
if(Constants.equalsInteger(c.getIdcardType(),Constants.ZERO)){
info.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+"");
info.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));
--
Gitblit v1.9.3