Merge branch 'dev' into test

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

@@ -27,6 +27,7 @@ import share.system.mapper.SStoreMapper;
 import share.system.request.SStoreRequest;
 import share.system.service.*;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -323,7 +324,8 @@ 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);
+                //截取2位小数
+                vo.setDistance(new BigDecimal(distance).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
                 // 计算当天预定最后预定时间
                 SOrder order = orderMap.get(vo.getId());
                 if (order != null) {