diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
index 059f5fb93..f776eadab 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
@@ -368,10 +368,10 @@
and hpip.room_status = #{record.roomStatus}
-
+
and hpip.start_time >= #{record.startTime}
-
+
and hpip.end_time <= #{record.endTime}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/TencentVod.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/TencentVod.java
index a297bc102..9191bfa47 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/TencentVod.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/TencentVod.java
@@ -1,6 +1,5 @@
package com.cool.store.dto.trtc.callback;
-import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
@@ -24,7 +23,7 @@ public class TencentVod {
@JsonProperty("StartTimeStamp")
private long startTimeStamp;
@JsonProperty("EndTimeStamp")
- private int endTimeStamp;
+ private long endTimeStamp;
public String getUserId() {
return userId;
@@ -82,11 +81,11 @@ public class TencentVod {
this.startTimeStamp = startTimeStamp;
}
- public int getEndTimeStamp() {
+ public long getEndTimeStamp() {
return endTimeStamp;
}
- public void setEndTimeStamp(int endTimeStamp) {
+ public void setEndTimeStamp(long endTimeStamp) {
this.endTimeStamp = endTimeStamp;
}
}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
index 01a841f2b..26a15a63b 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
@@ -125,7 +125,6 @@ public class FlowServiceImpl implements FlowService {
dataBody.setSkrName(request.getRealControlUsername());
dataBody.setSkrIDCard(request.getRealControlIdcard());
dataBody.setSkrRelship(request.getSignerRealControlRelation());
- String[] split = request.getSignerRealControlRelationCert().split(",");
dataBody.setSkrRelshipOther(request.getSignerOtherRealControlRelation());
dataBody.setAmtJoin(request.getPartnerFee());
dataBody.setAmtTechSer(request.getTechnicalServiceFee());
@@ -147,7 +146,7 @@ public class FlowServiceImpl implements FlowService {
String jobNumber = investmentManager.getJobnumber();
String mobile = investmentManager.getMobile();
DingdingUserDO dingdingUserDO = dingdingUserMapper.selectDingDingUserByMobile(mobile);
- if (Objects.isNull(dingdingUserDO)) {
+ if (Objects.isNull(dingdingUserDO) || Objects.isNull(dingdingUserDO.getUserid())) {
throw new ServiceException(ErrorCodeEnum.DINGDING_USER_NOT_EXIST);
}
rpcRequest.setDingUserId(dingdingUserDO.getUserid());
@@ -159,7 +158,7 @@ public class FlowServiceImpl implements FlowService {
if (!Objects.isNull(developmentDirector)) {
String mobile = developmentDirector.getMobile();
DingdingUserDO dingdingUserDO = dingdingUserMapper.selectDingDingUserByMobile(mobile);
- if (Objects.isNull(dingdingUserDO)) {
+ if (Objects.isNull(dingdingUserDO) || Objects.isNull(dingdingUserDO.getUserid())) {
throw new ServiceException(ErrorCodeEnum.DINGDING_USER_NOT_EXIST);
}
rpcRequest.getData().setUserSiteDevDingUserId(dingdingUserDO.getUserid());