diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/ClueDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/ClueDTO.java index 44ebbac..1108448 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/ClueDTO.java +++ b/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") diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/CustomEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/CustomEntity.java index 0310169..5688d67 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/CustomEntity.java +++ b/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 = "详细地址") diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java index b9abb82..c129902 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java @@ -54,7 +54,6 @@ public class CustomServiceImpl extends ExtendServiceImpl c.setCustomId(customId)); -// List entities = baseMapper.selectList(new LambdaQueryWrapper().eq(CustomStoreEntity::getCustomId, customId)); -// List allIdList = null; -// if (CollUtil.isNotEmpty(entities)) -// allIdList = entities.stream().map(CustomStoreEntity::getCustomStoreId).collect(Collectors.toList()); + List entities = baseMapper.selectList(new LambdaQueryWrapper().eq(CustomStoreEntity::getCustomId, customId)); + List allIdList = null; + if (CollUtil.isNotEmpty(entities)) + allIdList = entities.stream().map(CustomStoreEntity::getCustomStoreId).collect(Collectors.toList()); List filterList = customStoreEntities.stream().filter(c -> c.getCustomStoreId() != null).collect(Collectors.toList()); if (CollUtil.isNotEmpty(filterList)) { this.updateBatchById(filterList); + if (CollUtil.isNotEmpty(allIdList)) { + List 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 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 saveCustomStoreList = customStoreEntities.stream().filter(c -> c.getCustomStoreId() == null).collect(Collectors.toList()); if (CollUtil.isNotEmpty(saveCustomStoreList)) baseMapper.insertBatchSomeColumn(saveCustomStoreList); } diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/CustomStoreVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/CustomStoreVO.java index 7d46f0b..8371581 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/vo/CustomStoreVO.java +++ b/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; }