单位计算

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

@@ -1931,8 +1931,8 @@ public class AcceptCarriageOrderService {
 
         commonService.pushMessageByUrl(consignUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId()
                 , MessageEnum.CARRIAGE_NEW_LOGISTICS, MessageEnum.CARRIAGE_NEW_LOGISTICS_ORDER
-                ,messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(),messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl()
-                ,messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl()
+                , messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl()
+                , messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl()
         );
 
         System.out.println("承运订单新建订单-消息列表推送 end ");
@@ -2762,13 +2762,13 @@ public class AcceptCarriageOrderService {
         vo.setLastTotalPrice(lastWeek.getTotalPrice());
 
         /**计算待承运量*/
-        computeCompareWaitingAmount(resultVO,currentWeek,lastWeek);
+        computeCompareWaitingAmount(resultVO, currentWeek, lastWeek);
 
         /**承运量*/
-        computeCompareAmount(resultVO,currentWeek,lastWeek);
+        computeCompareAmount(resultVO, currentWeek, lastWeek);
 
         /**总金额（费用）*/
-        computeCompareTotalPrice(resultVO,currentWeek,lastWeek);
+        computeCompareTotalPrice(resultVO, currentWeek, lastWeek);
 
         /**待处理的金额*/
         SettlementMoney settlementMoney = paymentDubboService.countCarrier(id, dateType);
@@ -2836,7 +2836,7 @@ public class AcceptCarriageOrderService {
         resultVO.setAmountVO(amountVO);
     }
 
-    private void computeCompareWaitingAmount(StatisticsResultVO resultVO,StatisticsByOrderVO currentWeek,StatisticsByOrderVO lastWeek) {
+    private void computeCompareWaitingAmount(StatisticsResultVO resultVO, StatisticsByOrderVO currentWeek, StatisticsByOrderVO lastWeek) {
         Integer flag = 1;
         BigDecimal chainRatio = new BigDecimal("0.00");
         if (currentWeek.getWaitingAmount().compareTo(new BigDecimal("0.00")) == 0
@@ -2898,7 +2898,10 @@ public class AcceptCarriageOrderService {
             String dateEnd = cn.hutool.core.date.DateUtil.format(dateTime, DEF_DATE_FORMAT);
 
             List<LogisticsOrderStatisticsVO> list = logisticsOrderMapper.workbenchLogisticsOrderStatisticsByMonth(id, statusList,
-                    OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd,logisticsOrderStatistics.getTotalAmount(),logisticsOrderStatistics.getTotalPrice());
+                    OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTotalAmount(), logisticsOrderStatistics.getTotalPrice());
+            list.forEach(vo -> {
+                vo.setTotalPrice(vo.getTotalPrice().divide(new BigDecimal("10000.00")));
+            });
             return HttpResult.ok(list);
         } else if (String.valueOf(NumberConstant.ONE).equals(logisticsOrderStatistics.getDateType())) {
             //开始时间
@@ -2912,7 +2915,10 @@ public class AcceptCarriageOrderService {
             //结束时间
             String dateEnd = DateUtil.getLastWeekDateEndToString(0);
             List<LogisticsOrderStatisticsVO> list = logisticsOrderMapper.workbenchLogisticsOrderStatisticsByDays(id, statusList,
-                    OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd,logisticsOrderStatistics.getTotalAmount(),logisticsOrderStatistics.getTotalPrice());
+                    OrderTypeEnum.ACCEPT_CARRIAGE_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTotalAmount(), logisticsOrderStatistics.getTotalPrice());
+            list.forEach(vo -> {
+                vo.setTotalPrice(vo.getTotalPrice().divide(new BigDecimal("10000.00")));
+            });
             return HttpResult.ok(list);
         }
         return null;

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

@@ -2206,6 +2206,9 @@ public class ConsignOrderService {
 
             List<LogisticsOrderStatisticsVO> list = kwtLogisticsOrderMapper.workbenchLogisticsOrderStatisticsByMonth(id, statusList,
                     OrderTypeEnum.CONSIGN_ORDER.getType(), dateStart, dateEnd,logisticsOrderStatistics.getTotalAmount(),logisticsOrderStatistics.getTotalPrice());
+            list.forEach(vo -> {
+                vo.setTotalPrice(vo.getTotalPrice().divide(new BigDecimal("10000.00")));
+            });
             return HttpResult.ok(list);
         } else if (String.valueOf(NumberConstant.ONE).equals(logisticsOrderStatistics.getDateType())) {
             //开始时间
@@ -2220,6 +2223,9 @@ public class ConsignOrderService {
             String dateEnd = DateUtil.getLastWeekDateEndToString(0);
             List<LogisticsOrderStatisticsVO> list = kwtLogisticsOrderMapper.workbenchLogisticsOrderStatisticsByDays(id, statusList,
                     OrderTypeEnum.CONSIGN_ORDER.getType(), dateStart, dateEnd,logisticsOrderStatistics.getTotalAmount(),logisticsOrderStatistics.getTotalPrice());
+            list.forEach(vo -> {
+                vo.setTotalPrice(vo.getTotalPrice().divide(new BigDecimal("10000.00")));
+            });
             return HttpResult.ok(list);
         }
         return null;