新增积分规则修改功能

performance-api/src/main/java/com/clx/performance/enums/integral/IntegralRecordEnum.java

@@ -34,10 +34,8 @@ public enum IntegralRecordEnum {
 //        REPORT_TRUCK_INFO(50, "提交基础信息"),
         REPORT_REFUEL(51, "油表上报"),
         REPORT_TRAFFIC(52, "上报交通拥堵"),
-        REPORT_SEND_ADDRESS_WAIT(53, "上报货源地需要排队"),
-        REPORT_SEND_ADDRESS_NO_WAIT(54, "上报货源地无需排队"),
-        REPORT_RECEIVE_ADDRESS_WAIT(55, "上报目的地需要排队"),
-        REPORT_RECEIVE_ADDRESS_NO_WAIT(56, "上报目的地无需排队"),
+        REPORT_SEND_ADDRESS_WAIT(53, "上报货源地排队"),
+        REPORT_RECEIVE_ADDRESS_WAIT(55, "上报目的地排队"),
         REPORT_QUALITY(57, "上报煤炭质量问题"),
         REPORT_ABNORMAL(58, "上报拉运异常问题"),
         REPORT_SEND_ADDRESS_INFO(59, "上报货源地情况"),
@@ -58,9 +56,7 @@ public enum IntegralRecordEnum {
             Type.REPORT_REFUEL.value,
             Type.REPORT_TRAFFIC.value,
             Type.REPORT_SEND_ADDRESS_WAIT.value,
-            Type.REPORT_SEND_ADDRESS_NO_WAIT.value,
             Type.REPORT_RECEIVE_ADDRESS_WAIT.value,
-            Type.REPORT_RECEIVE_ADDRESS_NO_WAIT.value,
             Type.REPORT_QUALITY.value,
             Type.REPORT_ABNORMAL.value
 

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

@@ -205,5 +205,8 @@ public class OrderChildVO {
     @MoneyOutConvert
     private BigDecimal lossAmount;
 
+    @ApiModelProperty(value = "车辆未开启中交兴路的提示信息")
+    private String notOpenZJXLMsg;
+
 
 }
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/integral/AppIntegralRuleVO.java

@@ -122,14 +122,13 @@ public class AppIntegralRuleVO {
         private Integer integralRefuel;
 //        @ApiModelProperty(value = "上报交通拥堵积分x")
 //        private Integer integralTraffic;
-        @ApiModelProperty(value = "上报货源地需要排队积分x")
+        @ApiModelProperty(value = "上报货源地排队积分x")
         private Integer integralSendAddressWait;
-        @ApiModelProperty(value = "上报货源地无需排队积分x")
-        private Integer integralSendAddressNoWait;
+
         @ApiModelProperty(value = "上报目的地需要排队积分x")
         private Integer integralReceiveAddressWait;
-        @ApiModelProperty(value = "上报目的地无需排队积分x")
-        private Integer integralReceiveAddressNoWait;
+
+
         @ApiModelProperty(value = "上报煤炭质量问题积分x")
         private Integer integralQuality;
         @ApiModelProperty(value = "上报拉运异常问题积分x")

performance-web/src/main/java/com/clx/performance/service/impl/IntegralTruckServiceImpl.java

@@ -212,9 +212,7 @@ public class IntegralTruckServiceImpl implements IntegralTruckService {
                     IntegralRecordEnum.Type.REPORT_REFUEL.getValue(),
                     IntegralRecordEnum.Type.REPORT_TRAFFIC.getValue(),
                     IntegralRecordEnum.Type.REPORT_SEND_ADDRESS_WAIT.getValue(),
-                    IntegralRecordEnum.Type.REPORT_SEND_ADDRESS_NO_WAIT.getValue(),
                     IntegralRecordEnum.Type.REPORT_RECEIVE_ADDRESS_WAIT.getValue(),
-                    IntegralRecordEnum.Type.REPORT_RECEIVE_ADDRESS_NO_WAIT.getValue(),
                     IntegralRecordEnum.Type.REPORT_QUALITY.getValue(),
                     IntegralRecordEnum.Type.REPORT_ABNORMAL.getValue(),
                     IntegralRecordEnum.Type.REPORT_SEND_ADDRESS_INFO.getValue(),

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -1437,10 +1437,24 @@ public class OrderChildServiceImpl implements OrderChildService {
             result.setSettlementFreight(settlementOwnerDetail.getSettlementFreight());
         }
 
-
+        //查询进行中的运单车辆是否开启了中交兴路
+        result.setNotOpenZJXLMsg(isOpenZJXL(orderChild.getStatus(),orderChild.getTruckNo()));
         return result;
     }
 
+    //查看运单车辆是否开启了中交兴路
+    public String isOpenZJXL(Integer orderChildStatus,String truckNo){
+        if(orderChildStatus <= OrderChildEnum.Status.UNLOAD.getCode()){
+            BigDecimal[] currentTruckPosition = truckTraceService.getCurrentTruckPosition(truckNo);
+            if(Objects.isNull(currentTruckPosition)){
+                return "为保证您正常拉运及接单,请勿关闭车载定位设备";
+            }
+        }
+        return StringUtils.EMPTY;
+    }
+
+
+
     @Override
     public OrderChildVO getOwnerOrderChildInfo(String childNo) {
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectWaitReportServiceImpl.java

@@ -133,23 +133,29 @@ public class CollectWaitReportServiceImpl implements CollectWaitReportService {
 
         // 保存积分
         if (Objects.equals(collectTruckWait.getReportType(), CollectTruckWait.ReportType.LOAD.getCode())) {
-            if (Objects.equals(collectTruckWait.getWaitType(), CollectTruckWaitEnum.waitType.INNER.getCode())
+/*            if (Objects.equals(collectTruckWait.getWaitType(), CollectTruckWaitEnum.waitType.INNER.getCode())
                     || Objects.equals(collectTruckWait.getWaitType(), CollectTruckWaitEnum.waitType.OUTER.getCode())) {
                 integralRecordService.addDriverReportRecord(ruleInfo, collectTruckWait.getTruckNo(), IntegralRecordEnum.Type.REPORT_SEND_ADDRESS_WAIT.getValue(),
                         ruleInfo.getDriverReportRule().getIntegralSendAddressWait(), IntegralRecordEnum.Type.REPORT_SEND_ADDRESS_WAIT.getMsg());
             } else {
                 integralRecordService.addDriverReportRecord(ruleInfo, collectTruckWait.getTruckNo(), IntegralRecordEnum.Type.REPORT_SEND_ADDRESS_NO_WAIT.getValue(),
                         ruleInfo.getDriverReportRule().getIntegralSendAddressNoWait(), IntegralRecordEnum.Type.REPORT_SEND_ADDRESS_NO_WAIT.getMsg());
-            }
+            }*/
+
+            integralRecordService.addDriverReportRecord(ruleInfo, collectTruckWait.getTruckNo(), IntegralRecordEnum.Type.REPORT_SEND_ADDRESS_WAIT.getValue(),
+                    ruleInfo.getDriverReportRule().getIntegralSendAddressWait(), IntegralRecordEnum.Type.REPORT_SEND_ADDRESS_WAIT.getMsg());
+
         }else {
-            if (Objects.equals(collectTruckWait.getWaitType(), CollectTruckWaitEnum.waitType.INNER.getCode())
+/*            if (Objects.equals(collectTruckWait.getWaitType(), CollectTruckWaitEnum.waitType.INNER.getCode())
                     || Objects.equals(collectTruckWait.getWaitType(), CollectTruckWaitEnum.waitType.OUTER.getCode())) {
                 integralRecordService.addDriverReportRecord(ruleInfo, collectTruckWait.getTruckNo(), IntegralRecordEnum.Type.REPORT_RECEIVE_ADDRESS_WAIT.getValue(),
                         ruleInfo.getDriverReportRule().getIntegralReceiveAddressWait(), IntegralRecordEnum.Type.REPORT_RECEIVE_ADDRESS_WAIT.getMsg());
             } else {
                 integralRecordService.addDriverReportRecord(ruleInfo, collectTruckWait.getTruckNo(), IntegralRecordEnum.Type.REPORT_RECEIVE_ADDRESS_NO_WAIT.getValue(),
                         ruleInfo.getDriverReportRule().getIntegralReceiveAddressNoWait(), IntegralRecordEnum.Type.REPORT_RECEIVE_ADDRESS_NO_WAIT.getMsg());
-            }
+            }*/
+            integralRecordService.addDriverReportRecord(ruleInfo, collectTruckWait.getTruckNo(), IntegralRecordEnum.Type.REPORT_RECEIVE_ADDRESS_WAIT.getValue(),
+                    ruleInfo.getDriverReportRule().getIntegralReceiveAddressWait(), IntegralRecordEnum.Type.REPORT_RECEIVE_ADDRESS_WAIT.getMsg());
         }
     }