修改部分参数

admin/src/main/java/com/baiye/modules/distribute/dto/ClueDTO.java

@@ -2,8 +2,6 @@ package com.baiye.modules.distribute.dto;
 
 import com.baiye.modules.distribute.entity.LabelEntity;
 import com.baiye.validation.group.UpdateGroup;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.Data;

admin/src/main/java/com/baiye/modules/distribute/entity/CustomStoreEntity.java

@@ -11,8 +11,6 @@ import lombok.Setter;
 import org.springframework.validation.annotation.Validated;
 
 import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 @Getter
 @Setter

admin/src/main/java/com/baiye/modules/distribute/service/CustomService.java

@@ -12,7 +12,10 @@ import com.baiye.modules.distribute.vo.CustomVO;
 public interface CustomService extends ExtendService<CustomEntity> {
 
 	/**
-	 * 分页查询
+	 * 分页查询数据
+	 * @param pageParam
+	 * @param qo
+	 * @return
 	 */
 	PageResult<CustomVO> queryPage(PageParam pageParam, CustomQo qo);
 
@@ -24,24 +27,30 @@ public interface CustomService extends ExtendService<CustomEntity> {
 	boolean add(CustomDTO customDTO);
 
 	/**
-	 * 修改
+	 * 修改信息
+	 * @param customDTO
+	 * @return
 	 */
 	boolean update(CustomDTO customDTO);
 
 
 	/**
-	 * 详情
+	 * 表单详情
 	 */
 	CustomVO details(Long id);
 
 	/**
-	 * 删除
+	 * 删除表单
+	 * @param id
+	 * @return
 	 */
 	Boolean deleteApprovalFormById(Long id);
 
 
 	/**
 	 * 审批表单
+	 * @param dto
+	 * @return
 	 */
 	Boolean auditFormById(ChangeCustomDTO dto);
 }

admin/src/main/java/com/baiye/modules/distribute/service/StoreUserService.java

@@ -26,4 +26,11 @@ public interface StoreUserService extends ExtendService<StoreUserEntity> {
 	 * @param userId  坐席
 	 */
 	void insertStoreUser(Long storeId, Long userId);
+
+	/**
+	 *
+	 * @param storeId
+	 * @return
+	 */
+	Long findUserIdByStoreId(Long storeId);
 }

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

@@ -17,10 +17,7 @@ import com.baiye.modules.distribute.entity.CustomStoreEntity;
 import com.baiye.modules.distribute.entity.StoreEntity;
 import com.baiye.modules.distribute.mapper.CustomMapper;
 import com.baiye.modules.distribute.qo.CustomQo;
-import com.baiye.modules.distribute.service.ClueService;
-import com.baiye.modules.distribute.service.CustomService;
-import com.baiye.modules.distribute.service.CustomStoreService;
-import com.baiye.modules.distribute.service.StoreService;
+import com.baiye.modules.distribute.service.*;
 import com.baiye.modules.distribute.vo.AddressDTO;
 import com.baiye.modules.distribute.vo.CustomStoreVO;
 import com.baiye.modules.distribute.vo.CustomVO;
@@ -55,6 +52,9 @@ public class CustomServiceImpl extends ExtendServiceImpl<CustomMapper, CustomEnt
 
 	private final SecurityProperties securityProperties;
 
+	private final StoreUserService storeUserService;
+
+
 	private final ClueService clueService;
 
 	private final StoreService storeService;
@@ -147,11 +147,14 @@ public class CustomServiceImpl extends ExtendServiceImpl<CustomMapper, CustomEnt
 			List<CustomStoreEntity> customStores = customStoreService.selectListByCustomId(id);
 			if (CollUtil.isNotEmpty(customStores)) {
 				for (CustomStoreEntity store : customStores) {
+					Long userId = storeUserService.findUserIdByStoreId(store.getStoreId());
+					if (ObjectUtil.isNotNull(userId) && userId > 0){
 						ClueDTO clueDTO = ClueDTO.builder().originName(ClueSourceEnum.STORE_DISTRIBUTION.getDescription()).nid
 								(AESUtils.encrypt(customEntity.getCustomNid(), securityProperties.getPasswordSecretKey())).assignedBy
-							(store.getStoreId()).createBy(customEntity.getCompanyId()).assignedName(store.getStoreName()).otherClue(otherClue).build();
+										(userId).createBy(customEntity.getCompanyId()).assignedName(store.getStoreName()).otherClue(otherClue).build();
 						list.add(clueDTO);
 					}
+				}
 				clueService.saveClueListByStoreInfo(list);
 				customEntity.setEnrollStatus(2);
 				return SqlHelper.retBool(baseMapper.updateById(customEntity));

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

@@ -1,5 +1,6 @@
 package com.baiye.modules.distribute.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import com.baiye.modules.distribute.entity.StoreUserEntity;
 import com.baiye.modules.distribute.mapper.StoreUserMapper;
@@ -9,8 +10,8 @@ import com.baiye.system.model.dto.SysUserNameRoleDTO;
 import com.baiye.system.properties.BusinessProperties;
 import com.baiye.system.service.SysUserService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -48,4 +49,16 @@ public class StoreUserServiceImpl extends ExtendServiceImpl<StoreUserMapper, Sto
 		storeUserEntity.setUserId(userId);
 		baseMapper.insert(storeUserEntity);
 	}
+
+	@Override
+	public Long findUserIdByStoreId(Long storeId) {
+		List<StoreUserEntity> storeUserEntities = baseMapper.selectList
+				(Wrappers.<StoreUserEntity>lambdaQuery().eq(StoreUserEntity::getStoreId, storeId)
+						.orderByDesc(StoreUserEntity::getId));
+		if (CollUtil.isNotEmpty(storeUserEntities)){
+			return storeUserEntities.get(0).getUserId();
+		}
+		return 0L;
+	}
+
 }

admin/src/main/resources/application-dev.yml

@@ -12,8 +12,11 @@ spring:
 
 business:
   roleCodes:
-    - ROLE_ADMIN  # admin超级管理员
-    - ROLE_SALES_EXECUTIVE #业务管理员
+    # admin超级管理员
+    - ROLE_ADMIN
+    # 业务管理员
+    - ROLE_SALES_EXECUTIVE
+  storeCode: ROLE_STORE_EXECUTIVE
 
 
 urls:

admin/src/main/resources/application.yml

@@ -6,14 +6,7 @@ spring:
     name: @artifactId@
   profiles:
     active: dev
-  redis:
-    #数据库索引
-    database: 7
-    host: localhost
-    port: 6379
-    password:
-    #连接超时时间
-    timeout: 5000
+
 
 # 天爱图形验证码
 captcha:

admin/src/main/resources/mapper/CustomMapper.xml

@@ -24,10 +24,11 @@
 	</select>
 
 	<select id="selectMaxBatchNoByCompanyId" resultType="java.lang.String">
-		select max(batch_no)
+		select batch_no
 		from tb_custom
 		where batch_no like concat(#{code}, '%')
 		and company_id = #{companyId}
+		order by custom_id desc LIMIT 1
 	</select>
 
 </mapper>