含税金额计算

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

@@ -173,9 +173,9 @@ public class CommonService {
          * 根据单据计费方式处理【目前只考虑 按照装货量 按照卸货量 】*/
         String billingMode = logisticsOrder.getBillingMode();
         BigDecimal actualAmount = new BigDecimal("0.00");
-        if (DictEnum.CHARGING_TYPE_1.equals(billingMode)) {
+        if (DictEnum.CHARGING_TYPE_1.getValue().equals(billingMode)) {
             actualAmount = loadAmount;
-        } else if (DictEnum.CHARGING_TYPE_2.equals(billingMode)) {
+        } else if (DictEnum.CHARGING_TYPE_2.getValue().equals(billingMode)) {
             actualAmount = unloadAmount;
         } else {
             throw new BusinessException("单据计费方式错误!");

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

@@ -9,7 +9,6 @@ import com.sckw.contract.api.model.dto.res.ContractCommonInfoResDto;
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
-import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.CollectionUtils;
@@ -521,9 +520,9 @@ public class TransportCommonService {
 
                 String billingMode = logisticsOrderDTO.getBillingMode();
                 BigDecimal actualAmount = new BigDecimal("0.00");
-                if (DictEnum.CHARGING_TYPE_1.equals(billingMode)) {
+                if (DictEnum.CHARGING_TYPE_1.getValue().equals(billingMode)) {
                     actualAmount = logisticsOrderDTO.getLoadAmount();
-                } else if (DictEnum.CHARGING_TYPE_2.equals(billingMode)) {
+                } else if (DictEnum.CHARGING_TYPE_2.getValue().equals(billingMode)) {
                     actualAmount = logisticsOrderDTO.getUnloadAmount();
                 }
                 BigDecimal price = logisticsOrderDTO.getPrice() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getPrice();

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/dubbo/TransportDubboServiceImpl.java

@@ -145,9 +145,9 @@ public class TransportDubboServiceImpl implements TransportDubboService {
                 logisticsOrderDTO.setGoodsName(orderGoods == null ? null : orderGoods.getGoodsName());
                 String billingMode = logisticsOrderDTO.getBillingMode();
                 BigDecimal actualAmount = new BigDecimal("0.00");
-                if (DictEnum.CHARGING_TYPE_1.equals(billingMode)) {
+                if (DictEnum.CHARGING_TYPE_1.getValue().equals(billingMode)) {
                     actualAmount = logisticsOrderDTO.getLoadAmount();
-                } else if (DictEnum.CHARGING_TYPE_2.equals(billingMode)) {
+                } else if (DictEnum.CHARGING_TYPE_2.getValue().equals(billingMode)) {
                     actualAmount = logisticsOrderDTO.getUnloadAmount();
                 }
                 BigDecimal price = logisticsOrderDTO.getPrice() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getPrice();