1

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCarrierInfo.java

@@ -74,37 +74,37 @@ public class HyCarrierInfo extends BaseModel<HyCarrierInfo> {
      */
     private String loadingImg;
     /**
-     * 装车市经度
+     * 装车市
      */
-    private String loadingCityLongitude;
+    private String loadingCity;
     /**
-     * 装车市纬度
+     * 装车区
      */
-    private String loadingCityLatitude;
+    private String loadingArea;
     /**
-     * 装车区经度
+     * 装车经度
      */
-    private String loadingAreaLongitude;
+    private String loadingLongitude;
     /**
-     * 装车区纬度
+     * 装车纬度
      */
-    private String loadingAreaLatitude;
+    private String loadingLatitude;
     /**
-     * 卸车市经度
+     * 卸车市
      */
-    private String unloadingCityLongitude;
+    private String unloadingCity;
     /**
-     * 卸车市纬度
+     * 卸车区
      */
-    private String unloadingCityLatitude;
+    private String unloadingArea;
     /**
-     * 卸车区经度
+     * 卸车经度
      */
-    private String unloadingAreaLongitude;
+    private String unloadingLongitude;
     /**
-     * 卸车区纬度
+     * 卸车纬度
      */
-    private String unloadingAreaLatitude;
+    private String unloadingLatitude;
     /**
      * 合计运费（元）
      */

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -448,7 +448,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         //查询订单
         OrderInfo orderInfo1 = this.selectById(orderInfo.getId());
         if (orderInfo1 != null) {
-            //司机端和货主端装态改为已终止
+            //司机端和货主端装态改为已完结
             orderInfo1.setOrderStatusKey(StatusEnum.DRIVER_ORDER_FINISH.getFlag());
             orderInfo1.setOrderStatus(StatusEnum.DRIVER_ORDER_FINISH.getName());
             orderInfo1.setCargoOwnerStatusKey(StatusEnum.OWNER_ORDER_FINISH.getFlag());
@@ -835,11 +835,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     .eq("delete_flag", "0"));
             //查询车辆核定载重量
             if ("挂车".equals(hyDriverCarInfo.getCarCategory())) {
-                if (Double.valueOf(orderInfo.getWeight()) > hyDriverCarInfo.getGuaCarApprovedWeight()) {
+                if (Double.valueOf(orderInfo.getWeight()) > (hyDriverCarInfo.getGuaCarApprovedWeight()/1000)) {
                     throw new YException(YExceptionEnum.LOADING_NETWEIGHT_OVERLOAD);
                 }
             } else {
-                if (Double.valueOf(orderInfo.getWeight()) > hyDriverCarInfo.getCarApprovedWeight()) {
+                if (Double.valueOf(orderInfo.getWeight()) > (hyDriverCarInfo.getCarApprovedWeight()/1000)) {
                     throw new YException(YExceptionEnum.LOADING_NETWEIGHT_OVERLOAD);
                 }
             }