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

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -1055,7 +1055,7 @@ public class KwfTruckService {
                 KwfTruckGpsVo truckGps = new KwfTruckGpsVo();
                 truckGps.setLat(truck.getString("lat"));
                 truckGps.setLng(truck.getString("lng"));
-                truckGps.setSpeed(truck.getDouble("speed"));
+                truckGps.setSpeed(speed(truck.getString("speed")));
                 truckGps.setGpsTime(truck.getString("createTime"));
                 truckGps.setRunStatus(runStatus(truckGps.getGpsTime(), truckGps.getSpeed()));
                 truckGpsList.add(truckGps);
@@ -1084,7 +1084,7 @@ public class KwfTruckService {
                         truckGps.setTruckNo(truck.getString("vehicleNo"));
                         truckGps.setLat(truck.getString("lat"));
                         truckGps.setLng(truck.getString("lng"));
-                        truckGps.setSpeed(truck.getDouble("speed"));
+                        truckGps.setSpeed(speed(truck.getString("speed")));
                         truckGps.setGpsTime(truck.getString("createTime"));
                         truckGps.setRunStatus(runStatus(truckGps.getGpsTime(), truckGps.getSpeed()));
                         truckGpsList.add(truckGps);
@@ -1126,7 +1126,7 @@ public class KwfTruckService {
                     truckGps.setTruckNo(truck.getString("vehicleNo"));
                     truckGps.setLat(locateInfo.getString("lat"));
                     truckGps.setLng(locateInfo.getString("lng"));
-                    truckGps.setSpeed(locateInfo.getDouble("speed"));
+                    truckGps.setSpeed(speed(locateInfo.getString("speed")));
                     truckGps.setGpsTime(locateInfo.getString("createTime"));
                     truckGps.setRunStatus(runStatus(truckGps.getGpsTime(), truckGps.getSpeed()));
                     return truckGps;
@@ -1160,4 +1160,22 @@ public class KwfTruckService {
         return compareTo < 0 ? 2 : (speed == null || speed == 0) ? 1 : 0;
     }
 
+    /**
+     * @param obj 速度
+     * @desc 速度处理
+     * @author zk
+     * @date 2023/9/5
+     **/
+    public static Double speed(String obj) {
+        if (obj == null) {
+            return Global.AMOUNT;
+        }
+        try {
+            return Double.parseDouble(obj);
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return Global.AMOUNT;
+        }
+    }
+
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/AcceptCarriageOrderVO.java

@@ -318,4 +318,9 @@ public class AcceptCarriageOrderVO /*extends PageRequest*/ {
      */
     private String orderSourceLabel;
 
+    /**
+     *税率
+     */
+    private BigDecimal taxRate;
+
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/OrderDetailVO.java

@@ -245,5 +245,15 @@ public class OrderDetailVO {
      */
     private BigDecimal waitDistributionAmount;
 
+    /**
+     *税率
+     */
+    private BigDecimal taxRate;
+
+    /**
+     *税率
+     */
+    private String taxRateLabel;
+
 
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/SubcontractConsignmentVO.java

@@ -3,6 +3,7 @@ package com.sckw.transport.model.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -253,4 +254,14 @@ public class SubcontractConsignmentVO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
+    /**
+     *税率
+     */
+    private BigDecimal taxRate;
+
+    /**
+     *税率
+     */
+    private String taxRateLabel;
+
 }

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

@@ -1036,6 +1036,7 @@ public class AcceptCarriageOrderService {
                 subcontractConsignmentVO.setLoadAddressDetail(subcontractConsignmentVO.getLoadCityName() + subcontractConsignmentVO.getLoadAddress());
                 subcontractConsignmentVO.setUnloadAddressDetail(subcontractConsignmentVO.getUnloadCityName() + subcontractConsignmentVO.getUnloadAddress());
                 subcontractConsignmentVO.setOrderSourceLabel(orderSource == null ? null : orderSource.get(subcontractConsignmentVO.getOrderSource()));
+                subcontractConsignmentVO.setTaxRateLabel(subcontractConsignmentVO.getTaxRate()+"%");
             }
             allList.addAll(voList);
         }

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

@@ -192,6 +192,8 @@ public class TransportCommonService {
             orderDetailVO.setCarrierContacts(unitTwo.getContacts());
             orderDetailVO.setCarrierPhone(unitTwo.getPhone());
         }
+        orderDetailVO.setTaxRate(logisticsOrder.getTaxRate());
+        orderDetailVO.setTaxRateLabel(logisticsOrder.getTaxRate() + "%");
         orderDetailVO.setStatus(logisticsOrder.getStatus());
         orderDetailVO.setStatusLabel(LogisticsOrderEnum.getName(logisticsOrder.getStatus()));
         orderDetailVO.setGoodsId(String.valueOf(orderGoods == null ? null : orderGoods.getGoodsId()));
@@ -731,7 +733,7 @@ public class TransportCommonService {
         Map<String, String> taxRateTypeDictData = getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
         if (CollectionUtils.isNotEmpty(list)) {
             for (SckwLogisticsOrderVO vo : list) {
-                vo.setBillingModeLabel(chargingDictData==null?null:chargingDictData.get(vo.getBillingMode()));
+                vo.setBillingModeLabel(chargingDictData == null ? null : chargingDictData.get(vo.getBillingMode()));
                 vo.setPaymentLabel(vo.getPayment() == null ? null : tradeTypeDictData.get(vo.getPayment().toString()));
                 vo.setStatusLabel(LogisticsOrderEnum.getDestination(vo.getStatus()));
                 vo.setLossUnitLabel(vo.getLossUnit() == null ? null : taxRateTypeDictData.get(vo.getLossUnit()));

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

@@ -484,6 +484,7 @@
         f.detail_address as unloadAddress,
         a.billing_mode as billingMode,
         a.loss,
+        a.tax_rate as taxRate,
         a.loss_unit as lossUnit,
         a.goods_price as goodsPrice,
         a.goods_price_unit as goodsPriceUnit,

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

@@ -651,7 +651,7 @@
             and kwo.t_order_id = #{tOrderId, jdbcType=BIGINT}
         </if>
         <if test="lOrderId != null and lOrderId != ''">
-            and kwo.id = #{lOrderId, jdbcType=BIGINT}
+            and kwo.l_order_id = #{lOrderId, jdbcType=BIGINT}
         </if>
         <if test="driverId != null and driverId != ''">
             and kwo.driver_id = #{driverId, jdbcType=BIGINT}