Merge remote-tracking branch 'origin/master'

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

@@ -3,8 +3,10 @@ package com.baiye.modules.distribute.dto;
 import com.baiye.modules.distribute.entity.LabelEntity;
 import com.baiye.validation.group.UpdateGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotNull;
 import java.util.List;
@@ -15,6 +17,8 @@ import java.util.List;
  */
 @Data
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class ClueDTO {
 
 	@Schema(title = "线索ID")

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

@@ -52,7 +52,6 @@ public class CustomEntity extends BaseEntity {
 	private String market;
 
 	@Schema(title = "区")
-	@NotNull(message = "地址不能为空", groups = { CreateGroup.class })
 	private String distinguish;
 
 	@Schema(title = "详细地址")

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

@@ -54,7 +54,6 @@ public class CustomServiceImpl extends ExtendServiceImpl<CustomMapper, CustomEnt
 
 	private final StoreUserService storeUserService;
 
-
 	private final ClueService clueService;
 
 	private final StoreService storeService;
@@ -113,6 +112,8 @@ public class CustomServiceImpl extends ExtendServiceImpl<CustomMapper, CustomEnt
 				BeanUtils.copyProperties(customStore, customStoreVO);
 				if (map.containsKey(customStoreVO.getStoreId())) {
 					customStoreVO.setStoreName(map.get(customStoreVO.getStoreId()).get(0).getStoreName());
+					customStoreVO.setTradeStartTime(map.get(customStoreVO.getStoreId()).get(0).getTradeStartTime());
+					customStoreVO.setTradeEndTime(map.get(customStoreVO.getStoreId()).get(0).getTradeEndTime());
 				}
 				customStoreVOList.add(customStoreVO);
 			}

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

@@ -8,6 +8,7 @@ import com.baiye.modules.distribute.entity.CustomStoreEntity;
 import com.baiye.modules.distribute.mapper.CustomStoreMapper;
 import com.baiye.modules.distribute.service.CustomStoreService;
 import com.baiye.modules.distribute.vo.StoreDetailsExportVO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import org.springframework.stereotype.Service;
@@ -68,24 +69,22 @@ public class CustomStoreServiceImpl extends ExtendServiceImpl<CustomStoreMapper,
 		if (CollUtil.isEmpty(customStoreEntities)) throw new BadRequestException("预约门店不能为空");
 		// 修改时,预约门店关联的客户ID是确定的(编辑客户时新增门店,关联客户ID)
 		customStoreEntities.forEach(c -> c.setCustomId(customId));
-//		List<CustomStoreEntity> entities = baseMapper.selectList(new LambdaQueryWrapper<CustomStoreEntity>().eq(CustomStoreEntity::getCustomId, customId));
+		List<CustomStoreEntity> entities = baseMapper.selectList(new LambdaQueryWrapper<CustomStoreEntity>().eq(CustomStoreEntity::getCustomId, customId));
-//		List<Long> allIdList = null;
+		List<Long> allIdList = null;
-//		if (CollUtil.isNotEmpty(entities))
+		if (CollUtil.isNotEmpty(entities))
-//			allIdList = entities.stream().map(CustomStoreEntity::getCustomStoreId).collect(Collectors.toList());
+			allIdList = entities.stream().map(CustomStoreEntity::getCustomStoreId).collect(Collectors.toList());
 
 		List<CustomStoreEntity> filterList = customStoreEntities.stream().filter(c -> c.getCustomStoreId() != null).collect(Collectors.toList());
 		if (CollUtil.isNotEmpty(filterList)) {
 			this.updateBatchById(filterList);
+			if (CollUtil.isNotEmpty(allIdList)) {
+				List<Long> customStoreIdList = filterList.stream().map(CustomStoreEntity::getCustomStoreId).collect(Collectors.toList());
+				allIdList.removeAll(customStoreIdList);
+				if (CollUtil.isNotEmpty(allIdList)) baseMapper.deleteBatchIds(allIdList);
+			}
+		} else {
+			if (CollUtil.isNotEmpty(allIdList)) baseMapper.deleteBatchIds(allIdList);
 		}
-//			if (CollUtil.isNotEmpty(allIdList)) {
-//				List<Long> customStoreIdList = filterList.stream().map(CustomStoreEntity::getCustomStoreId).collect(Collectors.toList());
-//				allIdList.removeAll(customStoreIdList);
-//				if (CollUtil.isNotEmpty(allIdList)) baseMapper.deleteBatchIds(allIdList);
-//			}
-//		} else {
-//			if (CollUtil.isNotEmpty(allIdList)) baseMapper.deleteBatchIds(allIdList);
-//		}
-//	}
 		List<CustomStoreEntity> saveCustomStoreList = customStoreEntities.stream().filter(c -> c.getCustomStoreId() == null).collect(Collectors.toList());
 		if (CollUtil.isNotEmpty(saveCustomStoreList)) baseMapper.insertBatchSomeColumn(saveCustomStoreList);
 	}

admin/src/main/java/com/baiye/modules/distribute/vo/CustomStoreVO.java

@@ -25,4 +25,10 @@ public class CustomStoreVO {
 
 	@Schema(title = "预约时间")
 	private String reservationTime;
+
+	@Schema(description = "营业开始时间")
+	private String tradeStartTime;
+
+	@Schema(description = "营业结束时间")
+	private String tradeEndTime;
 }