|
@@ -279,13 +279,13 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
|
|
|
// 查询redis是否有同时发起的标记
|
|
|
String redisKey = CacheConstants.OLADING_SEND_BOTH_CHANNEL + userSub.getUserId();
|
|
|
Object userId = redisTemplate.opsForValue().get(redisKey);
|
|
|
- if (userId != null && GigTypeEnum.JIN_YUAN.equals(userSub.getGigType())) {
|
|
|
- // 将海南飞亿的状态,补充进来
|
|
|
+ if (userId != null && GigTypeEnum.OLADING.equals(userSub.getGigType())) {
|
|
|
+ // 将金园数科的状态,补充进来
|
|
|
SysUserSub feiyiSub = sysUserSubService.getOne(Wrappers.<SysUserSub>lambdaQuery()
|
|
|
.eq(SysUserSub::getUserId, userSub.getUserId())
|
|
|
.eq(SysUserSub::getDeptId, userSub.getDeptId())
|
|
|
- .eq(SysUserSub::getGigType, GigTypeEnum.OLADING));
|
|
|
- result.put(GigTypeEnum.OLADING.name(),
|
|
|
+ .eq(SysUserSub::getGigType, GigTypeEnum.JIN_YUAN));
|
|
|
+ result.put(GigTypeEnum.JIN_YUAN.name(),
|
|
|
MapUtil.builder("certStatus", OladingCertStatus.resolve(String.valueOf(feiyiSub.getCertStatus())).name()).build());
|
|
|
}
|
|
|
|
|
@@ -347,13 +347,13 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
|
|
|
// 查询redis是否有同时发起的标记
|
|
|
String redisKey = CacheConstants.OLADING_SEND_BOTH_CHANNEL + userSub.getUserId();
|
|
|
Object userId = redisTemplate.opsForValue().get(redisKey);
|
|
|
- if (userId != null && GigTypeEnum.JIN_YUAN.equals(userSub.getGigType())) {
|
|
|
- // 将海南飞亿的状态,补充进来
|
|
|
+ if (userId != null && GigTypeEnum.OLADING.equals(userSub.getGigType())) {
|
|
|
+ // 将金园数科的状态,补充进来
|
|
|
SysUserSub feiyiSub = sysUserSubService.getOne(Wrappers.<SysUserSub>lambdaQuery()
|
|
|
.eq(SysUserSub::getUserId, userSub.getUserId())
|
|
|
.eq(SysUserSub::getDeptId, userSub.getDeptId())
|
|
|
- .eq(SysUserSub::getGigType, GigTypeEnum.OLADING));
|
|
|
- result.put(GigTypeEnum.OLADING.name(),
|
|
|
+ .eq(SysUserSub::getGigType, GigTypeEnum.JIN_YUAN));
|
|
|
+ result.put(GigTypeEnum.JIN_YUAN.name(),
|
|
|
MapUtil.builder("certStatus", OladingCertStatus.resolve(String.valueOf(feiyiSub.getCertStatus())).name()).build());
|
|
|
}
|
|
|
|