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

sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementLogisticsMapper.xml

@@ -389,7 +389,6 @@
                (s.total_price - s.actual_price) as waitPrice,
                lu2.firm_name                    as firmName,
                s.id,
-               s.ent_id                         as entId,
                s.l_ledger_id                    as lLedgerId,
                s.sl_order_no                    as slOrderNo,
                s.name,
@@ -405,7 +404,9 @@
                     else s.success_phone end)   as phone,
                s.status,
                s.create_by                      as createBy,
-               s.create_time                    as createTime
+               s.update_by                      as updateBy,
+               s.create_time                    as createTime,
+               s.update_time                    as updateTime
         from kwp_settlement_logistics s
                  inner join kwp_ledger_logistics l on s.l_ledger_id = l.id
                  inner join kwp_ledger_logistics_unit lu on s.l_ledger_id = lu.l_ledger_id

sckw-modules/sckw-system/src/main/resources/mapper/KwsMenuDao.xml

@@ -270,7 +270,7 @@
     from kws_menu sm
     left join kws_menu_rights smr on sm.id = smr.menu_id
     where sm.del_flag = 0
-      <if test="systemType != 1">
+      <if test="systemType != 1 and clientType != 3">
         and smr.del_flag = 0
       </if>
     <if test="clientType != null">

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,