|
@@ -29,8 +29,10 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import java.util.Collection;
|
|
import java.util.Collection;
|
|
import java.util.Collections;
|
|
import java.util.Collections;
|
|
|
|
+import java.util.Comparator;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.concurrent.TimeUnit;
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 用户签约认证
|
|
* 用户签约认证
|
|
@@ -213,9 +215,12 @@ public class SysUserSignCertController {
|
|
CollUtil.intersection(userSignCertDTO.getGigTypeList(),
|
|
CollUtil.intersection(userSignCertDTO.getGigTypeList(),
|
|
CollUtil.toList(GigTypeEnum.OLADING, GigTypeEnum.JIN_YUAN, GigTypeEnum.XIN_TAI_ZI));
|
|
CollUtil.toList(GigTypeEnum.OLADING, GigTypeEnum.JIN_YUAN, GigTypeEnum.XIN_TAI_ZI));
|
|
if (!oladingTypeList.isEmpty()) {
|
|
if (!oladingTypeList.isEmpty()) {
|
|
|
|
+ List<GigTypeEnum> sortedList = oladingTypeList.stream()
|
|
|
|
+ .sorted(Comparator.comparing(GigTypeEnum::getCode))
|
|
|
|
+ .collect(Collectors.toList());
|
|
// 选择的渠道的阿拉钉的部分记录到redis
|
|
// 选择的渠道的阿拉钉的部分记录到redis
|
|
String redisKey = CacheConstants.OLADING_CERT_SEND_CHANNEL + userSignCertDTO.getUserId();
|
|
String redisKey = CacheConstants.OLADING_CERT_SEND_CHANNEL + userSignCertDTO.getUserId();
|
|
- redisTemplate.opsForValue().set(redisKey, JSONUtil.toJsonStr(oladingTypeList), 24, TimeUnit.HOURS);
|
|
|
|
|
|
+ redisTemplate.opsForValue().set(redisKey, JSONUtil.toJsonStr(sortedList), 24, TimeUnit.HOURS);
|
|
}
|
|
}
|
|
|
|
|
|
sysUserSignCertService.batchChannelCert(userSignCertDTO);
|
|
sysUserSignCertService.batchChannelCert(userSignCertDTO);
|