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

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

@@ -194,7 +194,7 @@ public class TransportDubboServiceImpl implements TransportDubboService {
                  * 3、罚款值=扣亏量 * 扣亏货值
                  *
                  * 二、运价计算：
-                 * 1、按装货量：总运价=实装量*运价
+                 * 1、按装货量：总运价=实装量*运价-罚款值
                  * 2、按卸货量：总运价=实卸量*运价-罚款值
                  * 3、按趟次：总运价=运价*趟次【后期加】
                  */
@@ -224,13 +224,13 @@ public class TransportDubboServiceImpl implements TransportDubboService {
                 /**
                  *
                  * 二、运价计算：
-                 * 1、按装货量：总运价=实装量*运价
+                 * 1、按装货量：总运价=实装量*运价-罚款值
                  * 2、按卸货量：总运价=实卸量*运价-罚款值
                  * 3、按趟次：总运价=运价*趟次【后期加】
                  */
                 BigDecimal actualAmount = new BigDecimal("0.00");
                 if (DictEnum.CHARGING_TYPE_1.getValue().equals(billingMode)) {
-                    actualAmount = (logisticsOrderDTO.getTotalLoadAmount() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getTotalLoadAmount()).multiply(price);
+                    actualAmount = (logisticsOrderDTO.getTotalLoadAmount() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getTotalLoadAmount()).multiply(price).subtract(fineValue);
                 } else if (DictEnum.CHARGING_TYPE_2.getValue().equals(billingMode)) {
                     actualAmount = (logisticsOrderDTO.getTotalUnloadAmount() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getTotalUnloadAmount()).multiply(price).subtract(fineValue);
                 }

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

@@ -608,7 +608,7 @@ public class TransportCommonService {
                  * 3、罚款值=扣亏量 * 扣亏货值
                  *
                  * 二、运价计算：
-                 * 1、按装货量：总运价=实装量*运价
+                 * 1、按装货量：总运价=实装量*运价-罚款值
                  * 2、按卸货量：总运价=实卸量*运价-罚款值
                  * 3、按趟次：总运价=运价*趟次【后期加】
                  */
@@ -637,13 +637,13 @@ public class TransportCommonService {
                 /**
                  *
                  * 二、运价计算：
-                 * 1、按装货量：总运价=实装量*运价
+                 * 1、按装货量：总运价=实装量*运价-罚款值
                  * 2、按卸货量：总运价=实卸量*运价-罚款值
                  * 3、按趟次：总运价=运价*趟次【后期加】
                  */
                 BigDecimal actualAmount = new BigDecimal("0.00");
                 if (DictEnum.CHARGING_TYPE_1.getValue().equals(billingMode)) {
-                    actualAmount = (logisticsOrderDTO.getTotalLoadAmount() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getTotalLoadAmount()).multiply(price);
+                    actualAmount = (logisticsOrderDTO.getTotalLoadAmount() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getTotalLoadAmount()).multiply(price).subtract(fineValue);
                 } else if (DictEnum.CHARGING_TYPE_2.getValue().equals(billingMode)) {
                     actualAmount = (logisticsOrderDTO.getTotalUnloadAmount() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getTotalUnloadAmount()).multiply(price).subtract(fineValue);
                 }