UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java
@@ -182,7 +182,7 @@ return ResultUtil.error("取消订单失败，订单信息有误"); } if(orderCharteredCar.getState() != 1){ return ResultUtil.error("取消订单失败，不合法的操作"); return ResultUtil.error("订单已取消，请刷新页面"); } OrderCancel orderCancel = new OrderCancel(); UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -1516,7 +1516,7 @@ return ResultUtil.error("取消订单失败，订单信息有误", ""); } if (orderCrossCity.getState() != 12) { return ResultUtil.error("取消订单失败，不合法的操作", ""); return ResultUtil.error("订单已取消，请刷新页面", ""); } OrderCancel orderCancel = null; if (null == cancleId) { @@ -1978,7 +1978,7 @@ return ResultUtil.error("取消订单失败，订单信息有误"); } if (orderCrossCity.getState() >= 5 && orderCrossCity.getState() != 7 && orderCrossCity.getState() != 11) { return ResultUtil.error("取消订单失败，不合法的操作"); return ResultUtil.error("订单已取消，请刷新页面"); } //还原座位 @@ -2459,6 +2459,14 @@ if (state != 1) { //关闭其他推送线程 Set<String> keySet = threadMap.keySet(); datas.forEach(e->{ threadMap.get(orderId + "_1"); }); for (String key : keySet) { if (!key.equals(orderId + "_1")) { Thread thread1 = threadMap.get(key);//中断线程 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/SiteServiceImpl.java
@@ -8,11 +8,17 @@ import com.stylefeng.guns.modular.crossCity.server.ISiteService; import com.stylefeng.guns.modular.crossCity.warpper.SiteWarpper; import com.stylefeng.guns.modular.system.util.GDMapElectricFenceUtil; import com.stylefeng.guns.modular.system.util.model.GeoFencingPolygon; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.geo.GeoJsonPoint; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; @Service @@ -25,7 +31,7 @@ private LocationMapper locationMapper; @Autowired private GDMapElectricFenceUtil gdMapElectricFenceUtil; private MongoTemplate mongoTemplate; /** @@ -106,12 +112,14 @@ } } if(Integer.valueOf(map.get("type").toString()) == 2){//电子围栏 String gid = map.get("gid").toString(); List<String> list1 = gdMapElectricFenceUtil.monitorElectricFenc("", lonLat); if(list1.contains(gid)){ String[] split = lonLat.split(","); GeoJsonPoint point = new GeoJsonPoint(Double.valueOf(split[0]), Double.valueOf(split[1])); Query query = Query.query(Criteria.where("geoJsonPolygon").intersects(point)); List<GeoFencingPolygon> geoFencingPolygons = mongoTemplate.find(query, GeoFencingPolygon.class); List<Integer> s_sites = geoFencingPolygons.stream().map(GeoFencingPolygon::getSiteId).collect(Collectors.toList()); if(s_sites.contains(siteId)){ return true; } continue; } } return false; UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -1149,7 +1149,7 @@ return ResultUtil.error("取消订单失败，订单信息有误"); } if(orderLogistics.getState() >= 5 && orderLogistics.getState() != 7 && orderLogistics.getState() != 8 && orderLogistics.getState() != 11){ return ResultUtil.error("取消订单失败，不合法的操作"); return ResultUtil.error("订单已取消，请刷新页面"); } if(orderLogistics.getState() == 7){ UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -973,7 +973,7 @@ // return ResultUtil.error("司机已到达预约点，取消会产生一定的费用"); // } if (orderPrivateCar.getState() >= 5 && orderPrivateCar.getState() != 11) { return ResultUtil.error("取消订单失败，不合法的操作"); return ResultUtil.error("订单已取消，请刷新页面"); } Integer number1 = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("pid", orderPrivateCar.getPid() == null ? orderPrivateCar.getId() : orderPrivateCar.getPid()).lt("state", 6)); Integer number2 = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("id", orderPrivateCar.getPid() == null ? orderPrivateCar.getId() : orderPrivateCar.getPid()).lt("state", 6)); @@ -1105,7 +1105,7 @@ return ResultUtil.error("取消订单失败，订单信息有误", ""); } if (orderPrivateCar.getState() != 12) { return ResultUtil.error("取消订单失败，不合法的操作", ""); return ResultUtil.error("订单已取消，请刷新页面", ""); } OrderCancel orderCancel = null; if (null == cancleId) { @@ -2139,6 +2139,7 @@ orderMoney = new BigDecimal(orderMoney).setScale(2, RoundingMode.HALF_UP).doubleValue(); System.out.println("!!!" + orderMoney + "!!!!"); orderMoney = orderMoney < 0 ? 0 : orderMoney; orderPrivateCar.setPayMoney(orderMoney); if (payType == 1) {//微信支付 if (orderMoney == 0) { return ResultUtil.error("请使用余额支付"); @@ -2274,7 +2275,6 @@ orderPrivateCar.setState(8); orderPrivateCar.setPayType(3); orderPrivateCar.setPayMoney(orderMoney); //处理优惠券和红包 if (null != userCouponRecord) { UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/model/GeoFencingPolygon.java
New file @@ -0,0 +1,35 @@ package com.stylefeng.guns.modular.system.util.model; import lombok.Data; import org.springframework.data.mongodb.core.geo.GeoJsonPolygon; import org.springframework.data.mongodb.core.index.GeoSpatialIndexType; import org.springframework.data.mongodb.core.index.GeoSpatialIndexed; import org.springframework.data.mongodb.core.mapping.Document; import java.io.Serializable; /** * 地理围栏-多边形 * @author zhibing.pu * @date 2023/4/29 23:53 */ @Data @Document(collection = "geo_fencing") public class GeoFencingPolygon implements Serializable { private static final long serialVersionUID = 4508868382007529971L; private String id; /** * 站点id */ private Integer siteId; /** * 站点名称 */ private String name; /** * 多边形经纬度 */ @GeoSpatialIndexed(type = GeoSpatialIndexType.GEO_2DSPHERE) private GeoJsonPolygon geoJsonPolygon; } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/model/GeoJson.java
New file @@ -0,0 +1,9 @@ package com.stylefeng.guns.modular.system.util.model; import lombok.Data; @Data public class GeoJson { private String type; private Double[] coordinates; } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/model/LocationQuery.java
New file @@ -0,0 +1,23 @@ package com.stylefeng.guns.modular.system.util.model; import lombok.Data; @Data public class LocationQuery { /** * 当前经纬度[xxx,xxx] **/ private Double[] coordinates; /** * 距离，如：200,500,1,3,5,10,20 **/ private Double distance; /** * 距离单位，如：m，km **/ private String unit; /** * 位置类型：1-景点，2-加油站，3-酒店 **/ private Integer type; } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -487,7 +487,7 @@ // return ResultUtil.error("司机已到达预约点，取消会产生一定的费用"); // } if (orderTaxi.getState() >= 5 && orderTaxi.getState() != 11) { return ResultUtil.error("取消订单失败，不合法的操作"); return ResultUtil.error("订单已取消，请刷新页面"); } if (null == orderTaxi.getDriverId()) {//没有接单的情况 if (orderTaxi.getType() == 2) {//摆渡车 @@ -588,7 +588,7 @@ return ResultUtil.error("取消订单失败，订单信息有误", ""); } if (orderTaxi.getState() != 12) { return ResultUtil.error("取消订单失败，不合法的操作", ""); return ResultUtil.error("订单已取消，请刷新页面", ""); } OrderCancel orderCancel = null; if (null == cancleId) {
