修正门店预约时间

admin/src/main/java/com/baiye/modules/distribute/qo/StoreQo.java

@@ -36,11 +36,15 @@ public class StoreQo {
 	@Parameter(description = "添加的结束时间")
 	private String createEndTime;
 
-	//	@Parameter(description = "营业开始时间")
+//	@Parameter(description = "营业开始时间")
 //	private String tradeStartTime;
-//
+
 //	@Parameter(description = "营业结束时间")
 //	private String tradeEndTime;
+
 	@Parameter(description = "创建人")
 	private Long createBy;
+
+	@Parameter(description = "身份类别 1-管理员用户 2-管理员下属用户")
+	private Integer roleType;
 }

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

@@ -38,7 +38,7 @@ public class CustomStoreServiceImpl extends ExtendServiceImpl<CustomStoreMapper,
 
 	@Override
 	public List<CustomStoreEntity> selectListByStoreId(Date startTime, Date endTime, Long storeId) {
-		return baseMapper.selectList(Wrappers.<CustomStoreEntity>lambdaQuery().eq(CustomStoreEntity::getStoreId, storeId).between(CustomStoreEntity::getCreateTime, startTime, endTime));
+		return baseMapper.selectList(Wrappers.<CustomStoreEntity>lambdaQuery().eq(CustomStoreEntity::getStoreId, storeId).between(CustomStoreEntity::getReservationDate, startTime, endTime));
 	}
 
 	@Override

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

@@ -83,7 +83,10 @@ public class StoreServiceImpl extends ExtendServiceImpl<StoreMapper, StoreEntity
 		if (qo.getStoreName() != null) {
 			wrapper.like(StoreEntity::getStoreName, qo.getStoreName());
 		}
-		wrapper.eq(StoreEntity::getCreateBy, SecurityUtils.getCurrentUserId());
+		if (qo.getRoleType() != null) {
+			wrapper.eq(StoreEntity::getCreateBy, qo.getRoleType() == 1 ? SecurityUtils.getCurrentUserId() : SecurityUtils.getWhichUserId());
+		}
+		wrapper.eq(StoreEntity::getDeleted, 0);
 		wrapper.orderByDesc(StoreEntity::getCreateTime);
 		List<StoreEntity> storeEntities = baseMapper.selectList(wrapper);
 		return Convert.toList(StoreVO.class, storeEntities);
@@ -135,7 +138,8 @@ public class StoreServiceImpl extends ExtendServiceImpl<StoreMapper, StoreEntity
 	@Override
 	public List<StoreDTO> queryRangeStore(Double longitude, Double latitude, Double distance) {
 		List<StoreDTO> list = new ArrayList<>();
-		Long userId = SecurityUtils.getCurrentUserId();
+		//todo
+		Long userId = SecurityUtils.getWhichUserId();
 		List<StoreDTO> stores = baseMapper.queryRangeStore(longitude, latitude, distance, userId);
 		if (CollUtil.isNotEmpty(stores)) {
 			int index = 0;
@@ -161,7 +165,7 @@ public class StoreServiceImpl extends ExtendServiceImpl<StoreMapper, StoreEntity
 			HashMap<String, Integer> map = new HashMap<>(8);
 			//按时间分组
 			customStoreEntities.forEach(c -> {
-				String format = DateUtil.format(c.getCreateTime(), "yyyy-MM-dd");
+				String format = DateUtil.format(c.getReservationDate(), "yyyy-MM-dd");
 				if (map.containsKey(format)) {
 					map.put(format, map.get(format) + 1);
 				} else {

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

@@ -9,8 +9,8 @@ import lombok.Data;
  */
 @Data
 public class StoreDetailsExportVO {
-	@Alias(value = "创建时间")
-	private String createTime;
+	@Alias(value = "预约日期")
+	private String reservationDate;
 	@Alias(value = "预约时间")
 	private String reservationTime;
 	@Alias(value = "客户名称")

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

@@ -14,16 +14,16 @@
 	</select>
 
 	<select id="selectStoreReservationDetails" resultType="com.baiye.modules.distribute.vo.StoreDetailsExportVO">
-		select tcs.create_time      as createTime,
-			   tcs.reservation_time as reservationTime,
-			   tc.custom_name       as customName,
-			   tc.custom_nid        as customNid,
-			   tc.detail_address    as detailAddress
+		select DATE_FORMAT(tcs.reservation_date, '%Y-%m-%d') as reservationDate,
+			   tcs.reservation_time                          as reservationTime,
+			   tc.custom_name                                as customName,
+			   tc.custom_nid                                 as customNid,
+			   tc.detail_address                             as detailAddress
 		from tb_custom_store tcs
 				 left join tb_custom tc
 						   on tcs.custom_id = tc.custom_id
 
 		where tcs.store_id = #{storeId}
-		  and tcs.create_time BETWEEN #{startTime} and #{endTime}
+		  and tcs.reservation_date BETWEEN #{startTime} and #{endTime}
 	</select>
 </mapper>