Merge branch 'dev' into test

share-system/src/main/java/share/system/domain/vo/SStoreVo.java

@@ -76,7 +76,7 @@ public class SStoreVo extends BaseEntity
     private String storeType;
 
     @ApiModelProperty(value = "距离（KM）")
-    private String distance;
+    private Double distance;
 
     @ApiModelProperty(value = "房间列表")
     private List<SRoomVo> roomVoList;

share-system/src/main/java/share/system/service/impl/SStoreServiceImpl.java

@@ -323,7 +323,7 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
                 double distance = geo.calcDistance(nowPoint, geo.makePoint(Double.parseDouble(o.getLongitude()), Double.parseDouble(o.getLatitude()))) * DistanceUtils.DEG_TO_KM;
                 SStoreVo vo = new SStoreVo();
                 BeanUtils.copyProperties(o, vo);
-                vo.setDistance(distance + "");
+                vo.setDistance(distance);
                 // 计算当天预定最后预定时间
                 SOrder order = orderMap.get(vo.getId());
                 if (order != null) {
@@ -350,7 +350,6 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
             });
             //排序条件   getStatus()从小到大并且getDistance()从小到大
             voList.sort(Comparator.comparing(SStoreVo::getStatus).thenComparing(SStoreVo::getDistance));
-//                    voList.stream().sorted(Comparator.comparing(storeVo -> Double.parseDouble(storeVo.getDistance()))).collect(Collectors.toList());
         }
         return voList;
     }