门店修改

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

@@ -64,10 +64,17 @@ public class StoreServiceImpl extends ExtendServiceImpl<StoreMapper, StoreEntity
 				List<SysUserNameRoleDTO> sysUserNameRoleS = sysUserService.listUserNameByUserIds(userIds);
 				userInfo = sysUserNameRoleS.stream().collect(Collectors.toMap(SysUserNameRoleDTO::getUserId, SysUserNameRoleDTO::getUserName));
 			}
-
+			String city = "";
+			String province = "";
+			String county = "";
+			String detail = "";
 			for (StoreVO vo : records) {
 				vo.setReservationNum(map.get(vo.getId()));
-				vo.setAddress(vo.getCity() + vo.getCounty());
+				city = vo.getCity();
+				province = vo.getProvince();
+				county = vo.getCounty();
+				detail = vo.getDetail();
+				vo.setAddress(province + city + county + detail);
 				vo.setTradeTime(vo.getTradeStartTime() + "-" + vo.getTradeEndTime());
 				if (vo.getUserId() != null) {
 					vo.setUserName(userInfo.get(vo.getUserId()));
@@ -140,6 +147,7 @@ public class StoreServiceImpl extends ExtendServiceImpl<StoreMapper, StoreEntity
 		List<StoreDTO> list = new ArrayList<>();
 		//todo
 		Long userId = SecurityUtils.getWhichUserId();
+
 		List<StoreDTO> stores = baseMapper.queryRangeStore(longitude, latitude, distance, userId);
 		if (CollUtil.isNotEmpty(stores)) {
 			int index = 0;

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

@@ -34,6 +34,9 @@ public class StoreVO {
 	@Schema(description = "区县")
 	private String county;
 
+	@Schema(description = "详情")
+	private String detail;
+
 	@Schema(description = "营业开始时间")
 	private String tradeStartTime;
 

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

@@ -53,7 +53,7 @@
 																									   PI() / 180) / 2),
 																				   2))) * 1000) AS distance
 		FROM tb_store
-		where create_by = 1
+		where create_by = #{userId}
 		  and deleted = 0
 		HAVING distance <= #{distance}
 		ORDER BY distance ASC