|
|
@@ -51,6 +51,8 @@ public class LifeUserStoreService {
|
|
|
|
|
|
private final StoreClockInService storeClockInService;
|
|
|
|
|
|
+ private final StoreBusinessInfoMapper storeBusinessInfoMapper;
|
|
|
+
|
|
|
/**
|
|
|
* 门店列表
|
|
|
*
|
|
|
@@ -105,6 +107,10 @@ public class LifeUserStoreService {
|
|
|
List<Map<Integer, Integer>> storeClockInCountList = storeClockInService.getStoreClockInCount();
|
|
|
// 遍历所有门店信息，构造返回结果
|
|
|
for (StoreInfoVo store : storeInfoVoList) {
|
|
|
+
|
|
|
+ //门店营业时间信息
|
|
|
+ StoreBusinessInfo storeBusinessInfo = storeBusinessInfoMapper.selectOne(new QueryWrapper<StoreBusinessInfo>().eq("store_id", store.getId()).eq("delete_flag", 0).last("limit 1"));
|
|
|
+
|
|
|
Map<String, Object> storeMap = new HashMap<>();
|
|
|
// 如果用户提供了经纬度信息，则计算并添加门店到用户的距离
|
|
|
if ((jingdu != null && !jingdu.isEmpty()) && (weidu != null && !weidu.isEmpty())) {
|
|
|
@@ -119,6 +125,10 @@ public class LifeUserStoreService {
|
|
|
// 添加门店的业务状态及其描述
|
|
|
storeMap.put("businessStatus", store.getBusinessStatus());
|
|
|
storeMap.put("businessStatusStr", store.getBusinessStatusStr());
|
|
|
+
|
|
|
+ //474bug
|
|
|
+ storeMap.put("businessTypesName", store.getBusinessTypesName());
|
|
|
+ storeMap.put("storeBusinessInfo", storeBusinessInfo);
|
|
|
// 添加门店ID
|
|
|
storeMap.put("storeId", store.getId());
|
|
|
// 如果存在评分数据，则添加评分、平均消费及评价总数
|
jyc