|
@@ -153,7 +153,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
|
locationUtil.geoAdd(LocationUtil.GEO_KEY_USER, "js" + js.getcOpenId(), Double.parseDouble(js.getLongitude().toString()), Double.parseDouble(js.getLatitude().toString()));
|
|
|
locationUtil.geoAdd(LocationUtil.GEO_KEY_USER, "user" + order.getcOpenId(), Double.parseDouble(address.getLongitude().toString()), Double.parseDouble(address.getLatitude().toString()));
|
|
|
double distance = locationUtil.getDistance(js.getcOpenId(), order.getcOpenId());
|
|
|
- locationUtil.remove(LocationUtil.GEO_KEY_USER, js.getcOpenId() + "," + order.getcOpenId());
|
|
|
+ locationUtil.remove(LocationUtil.GEO_KEY_USER, "js" + js.getcOpenId() + "," + "user" + order.getcOpenId());
|
|
|
order.setDistance(new BigDecimal(distance));
|
|
|
//计算车费
|
|
|
if (order.getDistance() != null && order.getDistance().compareTo(BigDecimal.ZERO) > 0) {
|