suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source
This commit is contained in:
zhangchenbiao
2023-06-29 19:27:28 +08:00
parent 63054bed46 36996cb064
commit b90733b901
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
View File

@@ -368,10 +368,10 @@
<if test="record.roomStatus !=null"> <if test="record.roomStatus !=null">
and hpip.room_status = #{record.roomStatus} and hpip.room_status = #{record.roomStatus}
</if> </if>
<if test="record.startTime !=null"> <if test="record.startTime !=null and record.startTime != ''">
and hpip.start_time &gt;= #{record.startTime} and hpip.start_time &gt;= #{record.startTime}
</if> </if>
<if test="record.endTime !=null"> <if test="record.endTime != null and record.endTime != ''">
and hpip.end_time &lt;= #{record.endTime} and hpip.end_time &lt;= #{record.endTime}
</if> </if>
<if test="record.deleted !=null and record.deleted!=''"> <if test="record.deleted !=null and record.deleted!=''">

7
coolstore-partner-model/src/main/java/com/cool/store/dto/trtc/callback/TencentVod.java
View File

@@ -1,6 +1,5 @@
package com.cool.store.dto.trtc.callback; package com.cool.store.dto.trtc.callback;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
/** /**
@@ -24,7 +23,7 @@ public class TencentVod {
@JsonProperty("StartTimeStamp") @JsonProperty("StartTimeStamp")
private long startTimeStamp; private long startTimeStamp;
@JsonProperty("EndTimeStamp") @JsonProperty("EndTimeStamp")
private int endTimeStamp; private long endTimeStamp;
public String getUserId() { public String getUserId() {
return userId; return userId;
@@ -82,11 +81,11 @@ public class TencentVod {
this.startTimeStamp = startTimeStamp; this.startTimeStamp = startTimeStamp;
} }
public int getEndTimeStamp() { public long getEndTimeStamp() {
return endTimeStamp; return endTimeStamp;
} }
public void setEndTimeStamp(int endTimeStamp) { public void setEndTimeStamp(long endTimeStamp) {
this.endTimeStamp = endTimeStamp; this.endTimeStamp = endTimeStamp;
} }
} }

5
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
View File

@@ -125,7 +125,6 @@ public class FlowServiceImpl implements FlowService {
dataBody.setSkrName(request.getRealControlUsername()); dataBody.setSkrName(request.getRealControlUsername());
dataBody.setSkrIDCard(request.getRealControlIdcard()); dataBody.setSkrIDCard(request.getRealControlIdcard());
dataBody.setSkrRelship(request.getSignerRealControlRelation()); dataBody.setSkrRelship(request.getSignerRealControlRelation());
String[] split = request.getSignerRealControlRelationCert().split(",");
dataBody.setSkrRelshipOther(request.getSignerOtherRealControlRelation()); dataBody.setSkrRelshipOther(request.getSignerOtherRealControlRelation());
dataBody.setAmtJoin(request.getPartnerFee()); dataBody.setAmtJoin(request.getPartnerFee());
dataBody.setAmtTechSer(request.getTechnicalServiceFee()); dataBody.setAmtTechSer(request.getTechnicalServiceFee());
@@ -147,7 +146,7 @@ public class FlowServiceImpl implements FlowService {
String jobNumber = investmentManager.getJobnumber(); String jobNumber = investmentManager.getJobnumber();
String mobile = investmentManager.getMobile(); String mobile = investmentManager.getMobile();
DingdingUserDO dingdingUserDO = dingdingUserMapper.selectDingDingUserByMobile(mobile); 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); throw new ServiceException(ErrorCodeEnum.DINGDING_USER_NOT_EXIST);
} }
rpcRequest.setDingUserId(dingdingUserDO.getUserid()); rpcRequest.setDingUserId(dingdingUserDO.getUserid());
@@ -159,7 +158,7 @@ public class FlowServiceImpl implements FlowService {
if (!Objects.isNull(developmentDirector)) { if (!Objects.isNull(developmentDirector)) {
String mobile = developmentDirector.getMobile(); String mobile = developmentDirector.getMobile();
DingdingUserDO dingdingUserDO = dingdingUserMapper.selectDingDingUserByMobile(mobile); 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); throw new ServiceException(ErrorCodeEnum.DINGDING_USER_NOT_EXIST);
} }
rpcRequest.getData().setUserSiteDevDingUserId(dingdingUserDO.getUserid()); rpcRequest.getData().setUserSiteDevDingUserId(dingdingUserDO.getUserid());