解决重复分发

admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java

@@ -33,6 +33,7 @@ import com.baiye.system.model.entity.SysUser;
 import com.baiye.system.service.SysUserRoleService;
 import com.baiye.system.service.SysUserService;
 import com.baiye.util.AESUtils;
+import com.baiye.util.RedisUtils;
 import com.baiye.utils.SerialCode;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.google.common.collect.Lists;
@@ -43,6 +44,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.ballcat.security.properties.SecurityProperties;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -50,6 +53,8 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -71,6 +76,8 @@ public class CustomServiceImpl extends ExtendServiceImpl<CustomMapper, CustomEnt
 
 	private final StoreService storeService;
 
+	private final RedisTemplate<Object, Object> redisTemplate;
+
 	@Value("${snowflake.workerId}")
 	private int workerId;
 
@@ -162,13 +169,18 @@ public class CustomServiceImpl extends ExtendServiceImpl<CustomMapper, CustomEnt
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public Boolean auditFormById(ChangeCustomDTO dto) {
+		ValueOperations<Object, Object> valueOperations = redisTemplate.opsForValue();
+		String key = "custom::audit:" + dto.getCustomId();
+		Long currentUserId = SecurityUtils.getCurrentUserId();
+		// 加锁
+		Boolean ifAbsent = valueOperations.setIfAbsent(key, currentUserId, 10, TimeUnit.SECONDS);
+		if ((null == ifAbsent) || (!ifAbsent)) throw new BadRequestException("10秒内不能重复分发同一客户");
 		Integer status = dto.getStatus();
 		List<Long> salesmanUserIdList = dto.getSalesmanUserId();
-		Long currentUserId = SecurityUtils.getCurrentUserId();
 
 		List<ClueDTO> list = Lists.newArrayList();
 		CustomEntity customEntity = baseMapper.selectById(dto.getCustomId());
-		if (ObjectUtil.isNotNull(customEntity)) {
+		if (ObjectUtil.isNotNull(customEntity) || customEntity.getEnrollStatus() != DefaultNumberConstants.TWO_NUMBER) {
 			String phone = AESUtils.encrypt(customEntity.getCustomNid(), securityProperties.getPasswordSecretKey());
 			Long companyId = customEntity.getCompanyId();
 			if (status == 0) {
@@ -222,9 +234,10 @@ public class CustomServiceImpl extends ExtendServiceImpl<CustomMapper, CustomEnt
 				customEntity.setEnrollStatus(2);
 				customEntity.setDistributeTime(DateUtil.date());
 				customEntity.setUpdateTime(LocalDateTime.now());
-				return SqlHelper.retBool(baseMapper.updateById(customEntity));
+				int update = baseMapper.updateById(customEntity);
-			}
+				return SqlHelper.retBool(update);
 			}
+		} else throw new BadRequestException("已分发,请勿重复分发");
 		return Boolean.FALSE;
 	}