电子联单bug 修复

2c2c2c
1 parent 38eec92a
Showing 3 changed files with 54 additions and 11 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderAssociationServiceAsync.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
@@ -204,6 +204,48 @@ public class GarOrderMatchAsk implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
+    /**
+     * 装车经纬度
+     */
+    private String loadingLonLat;
+
+    /**
+     * 卸车经纬度
+     */
+    private String unloadingLonLat;
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getLoadingLonLat() {
+        return loadingLonLat;
+    }
+
+    public void setLoadingLonLat(String loadingLonLat) {
+        this.loadingLonLat = loadingLonLat;
+    }
+
+    public String getUnloadingLonLat() {
+        return unloadingLonLat;
+    }
+
+    public void setUnloadingLonLat(String unloadingLonLat) {
+        this.unloadingLonLat = unloadingLonLat;
+    }
+
     public Date getGarOrderTime() {
         return garOrderTime;
     }
@@ -8,6 +8,7 @@ import com.trash.common.utils.RemoteServerUtils;
 import com.trash.dropPointInfo.domain.DropPointInfo;
 import com.trash.dropPointInfo.service.IDropPointInfoService;
 import com.trash.dropPointInfo.service.impl.DropPointInfoServiceImpl;
+import com.trash.garbage.pojo.domain.GarOrder;
 import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
 import com.trash.garbage.pojo.dto.AskTransportDto;
 import com.trash.garbage.pojo.dto.UploadDto;
@@ -48,18 +49,17 @@ public class GarOrderAssociationServiceAsync {
      * @param dto 上传对象
      */
     @Async
-    public void isWithinDropPointCoordinates(String carPlate, GarOrderMatchAsk garOrderMatchAsk, UploadDto dto) {
+    public void isWithinDropPointCoordinates(String carPlate, GarOrderMatchAsk garOrderMatchAsk, UploadDto dto, GarOrder garOrder) {
         try {
             log.info("开始判断车辆是否在投放点区域内");
-            DropPointInfo dropPointInfo = dropPointInfoService.selectDropPointInfoById((long) garOrderMatchAsk.getDropPointId());
+
             // 上传装车照片的经纬度
             double vehicleLat = dto.getLatitude();
             double vehicleLon = dto.getLongitude();
             // 获取投放点的经纬度
-            String[] coordinatePoint = dropPointInfo.getCoordinatePoint().split(",");
-            double dropPointLat = Double.parseDouble(coordinatePoint[1]);
-            double dropPointLon = Double.parseDouble(coordinatePoint[0]);
-
+            double dropPointLat = garOrder.getGarLatitude();
+            double dropPointLon = garOrder.getGarLongitude();
+            garOrderMatchAsk.setLoadingLonLat(dto.getLongitude()+","+dto.getLatitude());
             // 计算距离
             double distance = calculateDistance(vehicleLat, vehicleLon, dropPointLat, dropPointLon);
             log.info("车辆与投放点的距离为: {} 公里", distance);
@@ -68,8 +68,8 @@ public class GarOrderAssociationServiceAsync {
                 garOrderMatchAsk.setGarOrderType("0");
             }else{
                 garOrderMatchAsk.setGarOrderType("1");
-                log.info("{}车辆装车地点与投放点{}距离大于2公里,距离：{}", carPlate, dropPointInfo.getDropPointName(),distance);
-                garOrderMatchAsk.setGarRemark(carPlate+"车辆装车地点与投放点"+dropPointInfo.getDropPointName()+"距离大于2公里,距离："+distance+"公里");
+                log.info("{}车辆装车地点与投放点{}距离大于2公里,距离：{}", carPlate, garOrder.getGarOrderAddress()+garOrder.getGarOrderAddressDetails(),distance);
+                garOrderMatchAsk.setGarRemark(carPlate+"车辆装车地点与投放点<"+garOrder.getGarOrderAddress()+garOrder.getGarOrderAddressDetails()+">距离大于2公里,距离："+distance+"公里");
             }
         }catch (Exception e){
             log.error("判断车辆是否在投放点区域内发生异常: ", e);
@@ -97,9 +97,10 @@ public class GarOrderAssociationServiceAsync {
             JSONObject result = disposalJson.getJSONObject("result");
             JSONObject site = result.getJSONObject("site");
             String coord = site.getString("coord");
-            // 上传装车照片的经纬度
+            // 上传卸车照片的经纬度
             double vehicleLat = dto.getLatitude();
             double vehicleLon = dto.getLongitude();
+            garOrderMatchAsk.setUnloadingLonLat(dto.getLongitude()+","+dto.getLatitude());
             // 获取处置场所的经纬度列表
             List<double[]> coordinates = parseCoordinates(coord);
@@ -661,9 +661,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             List<GarOrderMatchAsk> askList = askService.list(qw);
             for (GarOrderMatchAsk garOrderMatchAsk : askList) {
                 //每次只判断一次
-                if(garOrderMatchAsk.getGarOrderType()==null && garOrderMatchAsk.getDropPointId() != 0){
+                if(garOrderMatchAsk.getGarOrderType()==null && garOrderMatchAsk.getLoadingLonLat()==null){
                     //判断车辆上传装车图片时是否在投放点区域内
-                    garOrderAssociationServiceAsync.isWithinDropPointCoordinates(dto.getCarPlate(), garOrderMatchAsk, dto);
+                    garOrderAssociationServiceAsync.isWithinDropPointCoordinates(dto.getCarPlate(), garOrderMatchAsk, dto, order);
                     break;
                 }
             }