新增扣亏量合理损耗单位为null的判断

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -306,10 +306,10 @@ public class AcceptCarriageOrderService {
         carriageUnit.setTopEntId(consignentMap == null ? null : consignentMap.getId());
 
 //        commonService.initIatingLogisticsConsignment(checkUnit, carriageUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId());
-        commonService.newSendLogisticsOrderToMessage(checkUnit,carriageUnit,logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
+        commonService.newSendLogisticsOrderToMessage(checkUnit, carriageUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
                 messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
                 messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
-                MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT,MessageEnum.NEW_CARRIAGE_ORDER,
+                MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT, MessageEnum.NEW_CARRIAGE_ORDER,
                 "1");
 
         //修改父级mongodb数据
@@ -783,11 +783,11 @@ public class AcceptCarriageOrderService {
 //            commonService.publicLogisticsConsignmentPushMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(),
 //                    logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
 //                    MessageEnum.CONSIGN_ACCEPT_LOGISTICS, MessageEnum.CARRIAGE_ACCEPT_LOGISTICS);
-            commonService.newSendLogisticsOrderToMessage(consignOrderUnit,carriageOrderUnit,logisticsOrder.getLOrderNo(),
+            commonService.newSendLogisticsOrderToMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(),
                     logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
-                    messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(),messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
-                    messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(),messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
-                    MessageEnum.CONSIGN_ACCEPT_LOGISTICS, MessageEnum.CARRIAGE_ACCEPT_LOGISTICS,"1");
+                    messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
+                    messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
+                    MessageEnum.CONSIGN_ACCEPT_LOGISTICS, MessageEnum.CARRIAGE_ACCEPT_LOGISTICS, "1");
         } else {
             orderStatus = LogisticsOrderEnum.REJECT_ORDER.getCode();
             //todo 改为拒绝接单  数据统计在页面已退回状态中
@@ -851,11 +851,11 @@ public class AcceptCarriageOrderService {
 //            commonService.publicLogisticsConsignmentPushMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(),
 //                    logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
 //                    MessageEnum.REJECT_ORDER, MessageEnum.CARRIAGE_DISALLOTMENT);
-            commonService.newSendLogisticsOrderToMessage(consignOrderUnit,carriageOrderUnit,logisticsOrder.getLOrderNo(),
+            commonService.newSendLogisticsOrderToMessage(consignOrderUnit, carriageOrderUnit, logisticsOrder.getLOrderNo(),
                     logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
-                    messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(),messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
-                    messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(),messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
-                    MessageEnum.REJECT_ORDER, MessageEnum.CARRIAGE_DISALLOTMENT,"1");
+                    messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
+                    messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
+                    MessageEnum.REJECT_ORDER, MessageEnum.CARRIAGE_DISALLOTMENT, "1");
         }
         //状态表新增状态数据
         KwtLogisticsOrderTrack track = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>()
@@ -1105,7 +1105,7 @@ public class AcceptCarriageOrderService {
                         driverListVo.setTransportStatusLabel((driverListVo.getTransportStatus() == 0) ? "空闲" : "任务中");
                     }
                     String truckType = truck.get(driverListVo.getTruckNo()).getTruckType();
-                    if (StringUtils.isNotBlank(truckType)){
+                    if (StringUtils.isNotBlank(truckType)) {
 //                        driverListVo.setCarType(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getTruckType());
                         driverListVo.setCarType(dictData.get(truckType));
                     }
@@ -1122,7 +1122,7 @@ public class AcceptCarriageOrderService {
             }
             Map<String, String> dictData = commonService.getDictData(DictTypeEnum.TRUCK_TYPE.getType());
             for (DriverListVo driverListVo : list) {
-                if (!driverListVo.getCirculateId().isEmpty()){
+                if (!driverListVo.getCirculateId().isEmpty()) {
 //                    driverListVo.setStatus(1);
                     driverListVo.setStatusLabel(CarWaybillEnum.PENDING_ORDER.getDestination());
                 }
@@ -1135,7 +1135,7 @@ public class AcceptCarriageOrderService {
                         driverListVo.setTransportStatusLabel((driverListVo.getTransportStatus() == 0) ? "空闲" : "任务中");
                     }
                     String truckType = truck.get(driverListVo.getTruckNo()).getTruckType();
-                    if (StringUtils.isNotBlank(truckType)){
+                    if (StringUtils.isNotBlank(truckType)) {
 //                        driverListVo.setCarType(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getTruckType());
                         driverListVo.setCarType(dictData.get(truckType));
                     }
@@ -1298,6 +1298,31 @@ public class AcceptCarriageOrderService {
         }
     }
 
+    public static void main(String[] args) {
+        Map<String, String> map =new HashMap<>();
+        map.put("a1","a1");
+        map.put("a2","a2");
+        map.put("a6","a6");
+        map.put("a3","a3");
+        map.put("a4","a4");
+        List<Map<String, String>> list = splitMap(map, 3);
+        System.out.println(JSONObject.toJSONString(list));
+    }
+
+    public static List<Map<String, String>> splitMap(Map<String, String> map, int batchSize) {
+        List<Map<String, String>> batchList = new ArrayList<>();
+        Iterator<Map.Entry<String, String>> iterator = map.entrySet().iterator();
+        while (iterator.hasNext()) {
+            Map<String, String> batchMap = new HashMap<>();
+            for (int i = 0; i < batchSize && iterator.hasNext(); i++) {
+                Map.Entry<String, String> entry = iterator.next();
+                batchMap.put(entry.getKey(),entry.getValue());
+            }
+            batchList.add(batchMap);
+        }
+        return batchList;
+    }
+
     /**
      * 承运订单-取消派车
      *

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/CommonService.java

@@ -822,7 +822,9 @@ public class CommonService {
 //        BigDecimal deficitPrice = deficitAmount.subtract(loadAmount.multiply(loss).setScale(4, RoundingMode.HALF_UP));
 //        return deficitPrice;
 
-
+        if (StringUtils.isBlank(lossUnit)) {
+            loss = new BigDecimal(Global.AMOUNT);
+        }
         //亏吨<=0
         if (deficitAmount.compareTo(new BigDecimal(Global.AMOUNT)) <= 0) {
             return new BigDecimal(Global.AMOUNT);
@@ -839,7 +841,7 @@ public class CommonService {
         }
         //扣亏量=亏吨量-合理损耗值【要求大于0，如果小于0则扣亏货量取0】
         BigDecimal deficitPrice = deficitAmount.subtract(loadAmount.multiply(loss).setScale(2, RoundingMode.HALF_UP));
-        log.error("[ddd] {}", deficitPrice);
+//        log.error("[ddd] {}", deficitPrice);
         if (deficitPrice.doubleValue() <= 0) {
             return new BigDecimal(Global.AMOUNT);
         }