Merge remote-tracking branch 'origin/dev' into dev

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/dto/AcceptCarriageLogisticsOrderDto.java

@@ -318,4 +318,9 @@ public class AcceptCarriageLogisticsOrderDto implements Serializable {
 
     @JsonProperty("totalUnloadAmount")
     private BigDecimal totalUnloadAmount;
+
+    /**
+     * 趟次（自己+下游承运总卸货量，算方式为趟次时，最终值以完结输入值为准）
+     */
+    private Integer totalTake;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportServiceImpl.java

@@ -312,8 +312,10 @@ public class TransportServiceImpl implements TransportRemoteService {
 //                    actualAmount = (logisticsOrderDTO.getTotalUnloadAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrderDTO.getTotalUnloadAmount()).multiply(price).subtract(fineValue);
         } else if (DictEnum.CHARGING_TYPE_3.getValue().equals(billingMode)) {
             // 物流订单运单趟次数量
-            WaybillCountVo waybillOrderCount = waybillOrderV1Mapper.findCountByLOrderId(Long.parseLong(logisticsOrderDTO.getLOrderId()));
-            BigDecimal totalComplete = waybillOrderCount == null ? NumberConstant.ZERO_TWO : new BigDecimal(waybillOrderCount.getTotalComplete());
+            /*WaybillCountVo waybillOrderCount = waybillOrderV1Mapper.findCountByLOrderId(Long.parseLong(logisticsOrderDTO.getLOrderId()));
+            BigDecimal totalComplete = waybillOrderCount == null ? NumberConstant.ZERO_TWO : new BigDecimal(waybillOrderCount.getTotalComplete());*/
+
+            BigDecimal totalComplete = BigDecimal.valueOf(logisticsOrderDTO.getTotalTake());
             actualAmount = totalComplete.multiply(price);
         } else if (DictEnum.CHARGING_TYPE_4.getValue().equals(billingMode)) {
             String lOrderId = logisticsOrderDTO.getLOrderId();

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

@@ -211,13 +211,14 @@ public class KwtCommonService {
         } else if (DictEnum.CHARGING_TYPE_2.getValue().equals(billingMode)) {
             actualAmount = unloadAmount;
         } else if (DictEnum.CHARGING_TYPE_3.getValue().equals(billingMode)) {
-            // 物流订单运单趟次数量
+            /*// 物流订单运单趟次数量
             Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN) {{
                 put("upperlOrderId", logisticsOrder.getId());
                 put("passStatus", Global.NUMERICAL_ONE);
             }};
             WaybillCountVo waybillOrderCount = kwtWaybillOrderV1Mapper.findWaybillOrderCount(map);
-            actualAmount = waybillOrderCount == null ? NumberConstant.ZERO_TWO : new BigDecimal(waybillOrderCount.getTotalComplete());
+            actualAmount = waybillOrderCount == null ? NumberConstant.ZERO_TWO : new BigDecimal(waybillOrderCount.getTotalComplete());*/
+            actualAmount = BigDecimal.valueOf(logisticsOrder.getTotalTake());
         } else if (DictEnum.CHARGING_TYPE_4.getValue().equals(billingMode)) {
             log.debug("“该方式不处理合同");
         } else {

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

@@ -393,14 +393,15 @@ public class KwtTransportCommonService {
             } else if (DictEnum.CHARGING_TYPE_2.getValue().equals(logisticsOrder.getBillingMode())) {
                 orderDetailVO.setOrderAmount(unloadAmount.multiply(price).subtract(fineValue));
             } else if (DictEnum.CHARGING_TYPE_3.getValue().equals(logisticsOrder.getBillingMode())) {
-                // 物流订单运单趟次数量
+                /*// 物流订单运单趟次数量
                 Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN) {{
                     put("upperlOrderId", logisticsOrder.getId());
                     put("passStatus", Global.NUMERICAL_ONE);
                 }};
                 WaybillCountVo waybillOrderCount = kwtWaybillOrderV1Mapper.findWaybillOrderCount(map);
-                int count = waybillOrderCount == null ? NumberConstant.ZERO : waybillOrderCount.getTotalComplete();
-                orderDetailVO.setOrderAmount(new BigDecimal(count).multiply(price).subtract(fineValue));
+                int count = waybillOrderCount == null ? NumberConstant.ZERO : waybillOrderCount.getTotalComplete();*/
+                BigDecimal totalComplete = BigDecimal.valueOf(logisticsOrder.getTotalTake());
+                orderDetailVO.setOrderAmount(totalComplete.multiply(price).subtract(fineValue));
             }
         } else {
             orderDetailVO.setOrderAmount(NumberUtils.parseBigDecimal(logisticsOrder.getAmount()).multiply(NumberUtils.parseBigDecimal(logisticsOrder.getPrice())));

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/operateService/KwtManagementLogisticsOrderService.java

@@ -719,13 +719,14 @@ public class KwtManagementLogisticsOrderService {
             } else if (DictEnum.CHARGING_TYPE_2.getValue().equals(logisticsOrder.getBillingMode())) {
                 orderDetailVO.setOrderAmount(unloadAmount.multiply(price).subtract(fineValue));
             } else if (DictEnum.CHARGING_TYPE_3.getValue().equals(logisticsOrder.getBillingMode())) {
-                // 物流订单运单趟次数量
+                /*// 物流订单运单趟次数量
                 Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN) {{
                     put("upperlOrderId", logisticsOrder.getId());
                     put("passStatus", Global.NUMERICAL_ONE);
                 }};
                 WaybillCountVo waybillOrderCount = waybillOrderMapper.findWaybillOrderCount(map);
-                BigDecimal totalComplete = waybillOrderCount == null ? NumberConstant.ZERO_TWO : new BigDecimal(waybillOrderCount.getTotalComplete());
+                BigDecimal totalComplete = waybillOrderCount == null ? NumberConstant.ZERO_TWO : new BigDecimal(waybillOrderCount.getTotalComplete());*/
+                BigDecimal totalComplete = BigDecimal.valueOf(logisticsOrder.getTotalTake());
                 orderDetailVO.setOrderAmount(totalComplete.multiply(price).subtract(fineValue));
             }
         } else {

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -812,6 +812,7 @@
                         a.unload_amount       AS unloadAmount,
                         a.total_load_amount   AS totalLoadAmount,
                         a.total_unload_amount AS totalUnloadAmount,
+                        a.total_take AS totalTake,
                         a.settlement_cycle    as settlementCycle,
                         a.start_time          AS startTime,
                         a.end_time            AS endTime,