|
|
@@ -379,7 +379,8 @@ public class ConsignOrderService {
|
|
|
//亏吨量
|
|
|
BigDecimal defectiveWeigh = kwtWaybillOrder.getDeficitAmount() == null ? new BigDecimal("0.00") : kwtWaybillOrder.getDeficitAmount();
|
|
|
//扣亏量/吨
|
|
|
- BigDecimal deduct = defectiveWeigh.compareTo(new BigDecimal("0.00")) == 0 ? new BigDecimal("0.00") : defectiveWeigh.subtract(multiply);
|
|
|
+// BigDecimal deduct = defectiveWeigh.compareTo(new BigDecimal("0.00")) == 0 ? new BigDecimal("0.00") : defectiveWeigh.subtract(multiply);
|
|
|
+ BigDecimal deduct = commonService.deficitPrice(loadAmount, defectiveWeigh, loss, order.getLossUnit());
|
|
|
carWaybillVo.setLOrderId(String.valueOf(kwtWaybillOrder.getLOrderId()));
|
|
|
carWaybillVo.setLOrderNo(order.getLOrderNo());
|
|
|
carWaybillVo.setWOrderId(String.valueOf(kwtWaybillOrder.getId()));
|
|
|
@@ -646,7 +647,8 @@ public class ConsignOrderService {
|
|
|
//亏吨量
|
|
|
BigDecimal defectiveWeigh = kwtWaybillOrder.getDeficitAmount() == null ? new BigDecimal("0.00") : kwtWaybillOrder.getDeficitAmount();
|
|
|
//扣亏量/吨
|
|
|
- BigDecimal deduct = defectiveWeigh.compareTo(new BigDecimal("0.00")) == 0 ? new BigDecimal("0.00") : defectiveWeigh.subtract(multiply);
|
|
|
+// BigDecimal deduct = defectiveWeigh.compareTo(new BigDecimal("0.00")) == 0 ? new BigDecimal("0.00") : defectiveWeigh.subtract(multiply);
|
|
|
+ BigDecimal deduct = commonService.deficitPrice(loadAmount, defectiveWeigh, loss, order.getLossUnit());
|
|
|
carWaybillVo.setWOrderId(String.valueOf(kwtWaybillOrder.getId()));
|
|
|
carWaybillVo.setWOrderNo(kwtWaybillOrder.getWOrderNo());
|
|
|
carWaybillVo.setTruckNo(kwtWaybillOrder.getTruckNo());
|
|
|
@@ -872,7 +874,7 @@ public class ConsignOrderService {
|
|
|
HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrder(param);
|
|
|
if (result1.getCode() != HttpStatus.SUCCESS_CODE) {
|
|
|
log.info("托运订单手动完结订单-完结订单,返回信息:{}", "id:" + logisticsOrder.getTOrderId() + "orderNo" + logisticsOrder.getTOrderNo(), JSONObject.toJSONString(result1));
|
|
|
- throw new BusinessException("{" + logisticsOrder.getTOrderNo() + "} 托运订单手动完结订单-完结订单!"+result1.getMsg());
|
|
|
+ throw new BusinessException("{" + logisticsOrder.getTOrderNo() + "} 托运订单手动完结订单-完结订单!" + result1.getMsg());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1680,7 +1682,7 @@ public class ConsignOrderService {
|
|
|
if (StringUtils.isNotBlank(query.getIds())) {
|
|
|
idsList = StringUtils.splitStrToList(query.getIds(), Long.class);
|
|
|
}
|
|
|
- List<AcceptCarriageOrderVO> list = kwtLogisticsOrderMapper.selectLogisticsOrderListByConsign(query, orderList, type, entId, longList, longList,idsList);
|
|
|
+ List<AcceptCarriageOrderVO> list = kwtLogisticsOrderMapper.selectLogisticsOrderListByConsign(query, orderList, type, entId, longList, longList, idsList);
|
|
|
PageInfo<AcceptCarriageOrderVO> pageInfo = new PageInfo<>(list);
|
|
|
if (CollectionUtils.isEmpty(list)) {
|
|
|
return PageRes.build(pageInfo, list);
|
|
|
@@ -1800,7 +1802,7 @@ public class ConsignOrderService {
|
|
|
List<Long> longList = longs.stream().distinct().collect(Collectors.toList());
|
|
|
List<Long> idsList = StringUtils.splitStrToList(query.getIds(), Long.class);
|
|
|
// List<TableTops> list = kwtLogisticsOrderMapper.countLogisticsOrderListByStatus(query, orderList, type, entId, longList, longList,idsList);
|
|
|
- List<TableTops> list = kwtLogisticsOrderMapper.countLogisticsOrderListByConsignStatus(query, orderList, type, entId, longList, longList,idsList);
|
|
|
+ List<TableTops> list = kwtLogisticsOrderMapper.countLogisticsOrderListByConsignStatus(query, orderList, type, entId, longList, longList, idsList);
|
|
|
List<TableTops> arrayList = new ArrayList<>();
|
|
|
arrayList.addAll(list);
|
|
|
/**补全数据状态不齐的情况*/
|
|
|
@@ -1896,7 +1898,7 @@ public class ConsignOrderService {
|
|
|
List<Long> longList = longs.stream().distinct().collect(Collectors.toList());
|
|
|
List<Long> idsList = StringUtils.splitStrToList(query.getIds(), Long.class);
|
|
|
// List<ConsignOrderVO> list = kwtLogisticsOrderMapper.selectConsignLogisticsOrderList(query, orderList, type, entId, longList, longList,idsList);
|
|
|
- List<ConsignOrderVO> list = kwtLogisticsOrderMapper.selectConsignLogisticsOrderListByConsign(query, orderList, type, entId, longList, longList,idsList);
|
|
|
+ List<ConsignOrderVO> list = kwtLogisticsOrderMapper.selectConsignLogisticsOrderListByConsign(query, orderList, type, entId, longList, longList, idsList);
|
|
|
// List<ConsignOrderVO> list = kwtLogisticsOrderMapper.selectLogisticsOrderListByConsign(query, orderList, type, entId, longList, longList,idsList);
|
|
|
/**计费方式*/
|
|
|
Map<String, String> chargingDictData = commonService.getDictData(DictTypeEnum.CHARGING_TYPE.getType());
|
|
|
@@ -1963,7 +1965,7 @@ public class ConsignOrderService {
|
|
|
}
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
- log.error("tradeOrderInfoService.getOrderDetailById error id:{},errorMessage:{}",tOrderId,e.getMessage(),e);
|
|
|
+ log.error("tradeOrderInfoService.getOrderDetailById error id:{},errorMessage:{}", tOrderId, e.getMessage(), e);
|
|
|
}
|
|
|
}
|
|
|
consignOrderExcelVo.setSubcontractAmount(Objects.isNull(vo.getSubcontractAmount()) ? null : df.format(vo.getSubcontractAmount()) + priceType.get(vo.getPriceType()));
|
|
|
@@ -1993,7 +1995,7 @@ public class ConsignOrderService {
|
|
|
String lastWeekDateStart = DateUtil.getLastWeekDateStartToString(LocalDate.now(), 13);
|
|
|
//结束时间
|
|
|
String lastWeekDateEnd = DateUtil.getLastWeekDateEndToString(7);
|
|
|
- return computeCompare(entCacheResDto.getId(), weekDateStart, weekDateEnd, lastWeekDateStart, lastWeekDateEnd,2);
|
|
|
+ return computeCompare(entCacheResDto.getId(), weekDateStart, weekDateEnd, lastWeekDateStart, lastWeekDateEnd, 2);
|
|
|
} else if (String.valueOf(NumberConstant.TWO).equals(dateType)) {
|
|
|
//月
|
|
|
//开始时间
|
|
|
@@ -2005,7 +2007,7 @@ public class ConsignOrderService {
|
|
|
String lastMonthDateStart = DateUtil.getBeforeMonthDateAndDaysStartToString(LocalDateTime.now(), 2, -1);
|
|
|
//结束时间
|
|
|
String lastMonthDateEnd = DateUtil.getBeforeMonthDateAndDaysEndToString(LocalDateTime.now(), 1, 0);
|
|
|
- return computeCompare(entCacheResDto.getId(), monthDateStart, monthDateEnd, lastMonthDateStart, lastMonthDateEnd,3);
|
|
|
+ return computeCompare(entCacheResDto.getId(), monthDateStart, monthDateEnd, lastMonthDateStart, lastMonthDateEnd, 3);
|
|
|
} else if (String.valueOf(NumberConstant.THREE).equals(dateType)) {
|
|
|
//年
|
|
|
|
|
|
@@ -2026,7 +2028,7 @@ public class ConsignOrderService {
|
|
|
* @param lastWeekDateEnd 环比上次结束时间
|
|
|
* @return
|
|
|
*/
|
|
|
- private HttpResult computeCompare(Long id, String weekDateStart, String weekDateEnd, String lastWeekDateStart, String lastWeekDateEnd,Integer dateType) {
|
|
|
+ private HttpResult computeCompare(Long id, String weekDateStart, String weekDateEnd, String lastWeekDateStart, String lastWeekDateEnd, Integer dateType) {
|
|
|
HttpResult httpResult = new HttpResult();
|
|
|
StatisticsResultVO resultVO = new StatisticsResultVO();
|
|
|
//本周
|
|
|
@@ -2043,7 +2045,7 @@ public class ConsignOrderService {
|
|
|
statusList.add(LogisticsOrderEnum.PENDING_ORDER.getCode());
|
|
|
statusList.add(LogisticsOrderEnum.WAIT_DELIVERY.getCode());
|
|
|
statusList.add(LogisticsOrderEnum.IN_TRANSIT.getCode());
|
|
|
- StatisticsByOrderVO currentFinishIng= kwtLogisticsOrderMapper.selectAcceptCarriageAwaitFinishOrder(statusList, weekDateStart, weekDateEnd, id, OrderTypeEnum.CONSIGN_ORDER.getType());
|
|
|
+ StatisticsByOrderVO currentFinishIng = kwtLogisticsOrderMapper.selectAcceptCarriageAwaitFinishOrder(statusList, weekDateStart, weekDateEnd, id, OrderTypeEnum.CONSIGN_ORDER.getType());
|
|
|
//全部的未履约量
|
|
|
BigDecimal waitingAmount = currentFinish.getWaitingAmount().add(currentFinishIng.getWaitingAmount());
|
|
|
BigDecimal amount = currentFinish.getAmount().add(currentFinishIng.getAmount());
|
|
|
@@ -2089,13 +2091,13 @@ public class ConsignOrderService {
|
|
|
last.setTotalPrice(lastTotalPrice);
|
|
|
|
|
|
/**计算待承运量*/
|
|
|
- computeCompareWaitingAmount(resultVO,current,last);
|
|
|
+ computeCompareWaitingAmount(resultVO, current, last);
|
|
|
|
|
|
/**承运量*/
|
|
|
- computeCompareAmount(resultVO,current,last);
|
|
|
+ computeCompareAmount(resultVO, current, last);
|
|
|
|
|
|
/**总金额（费用）*/
|
|
|
- computeCompareTotalPrice(resultVO,current,last);
|
|
|
+ computeCompareTotalPrice(resultVO, current, last);
|
|
|
|
|
|
/**待处理的金额*/
|
|
|
SettlementMoney settlementMoney = paymentDubboService.countShipper(id, dateType);
|
|
|
@@ -2162,7 +2164,8 @@ public class ConsignOrderService {
|
|
|
amountVO.setLastAmount(lastWeek.getAmount());
|
|
|
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
|
|
|
@@ -2188,6 +2191,7 @@ public class ConsignOrderService {
|
|
|
waitingAmountVO.setLastWaitingAmount(lastWeek.getWaitingAmount());
|
|
|
resultVO.setWaitingAmountVO(waitingAmountVO);
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 工作台-物流运输数据统计
|
|
|
*
|
|
|
@@ -2223,16 +2227,16 @@ public class ConsignOrderService {
|
|
|
String dateEnd = cn.hutool.core.date.DateUtil.format(dateTime, DEF_DATE_FORMAT);
|
|
|
|
|
|
List<LogisticsOrderStatisticsVO> list = kwtLogisticsOrderMapper.workbenchLogisticsOrderStatisticsByMonth(id, statusList,
|
|
|
- OrderTypeEnum.CONSIGN_ORDER.getType(), dateStart, dateEnd,logisticsOrderStatistics.getTypeOne(),logisticsOrderStatistics.getTypeTwo());
|
|
|
- if (logisticsOrderStatistics.getTypeOne().equals("2")){
|
|
|
+ OrderTypeEnum.CONSIGN_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
|
|
|
+ if (logisticsOrderStatistics.getTypeOne().equals("2")) {
|
|
|
list.forEach(vo -> {
|
|
|
- vo.setTypeTwo(vo.getTypeTwo().setScale(2,RoundingMode.HALF_UP));
|
|
|
+ vo.setTypeTwo(vo.getTypeTwo().setScale(2, RoundingMode.HALF_UP));
|
|
|
vo.setTypeOne(vo.getTypeOne().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
|
|
|
});
|
|
|
}
|
|
|
- if (logisticsOrderStatistics.getTypeTwo().equals("2")){
|
|
|
+ if (logisticsOrderStatistics.getTypeTwo().equals("2")) {
|
|
|
list.forEach(vo -> {
|
|
|
- vo.setTypeOne(vo.getTypeOne().setScale(2,RoundingMode.HALF_UP));
|
|
|
+ vo.setTypeOne(vo.getTypeOne().setScale(2, RoundingMode.HALF_UP));
|
|
|
vo.setTypeTwo(vo.getTypeTwo().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
|
|
|
});
|
|
|
}
|
|
|
@@ -2249,16 +2253,16 @@ public class ConsignOrderService {
|
|
|
//结束时间
|
|
|
String dateEnd = DateUtil.getLastWeekDateEndToString(0);
|
|
|
List<LogisticsOrderStatisticsVO> list = kwtLogisticsOrderMapper.workbenchLogisticsOrderStatisticsByDays(id, statusList,
|
|
|
- OrderTypeEnum.CONSIGN_ORDER.getType(), dateStart, dateEnd,logisticsOrderStatistics.getTypeOne(),logisticsOrderStatistics.getTypeTwo());
|
|
|
- if (logisticsOrderStatistics.getTypeOne().equals("2")){
|
|
|
+ OrderTypeEnum.CONSIGN_ORDER.getType(), dateStart, dateEnd, logisticsOrderStatistics.getTypeOne(), logisticsOrderStatistics.getTypeTwo());
|
|
|
+ if (logisticsOrderStatistics.getTypeOne().equals("2")) {
|
|
|
list.forEach(vo -> {
|
|
|
- vo.setTypeTwo(vo.getTypeTwo().setScale(2,RoundingMode.HALF_UP));
|
|
|
+ vo.setTypeTwo(vo.getTypeTwo().setScale(2, RoundingMode.HALF_UP));
|
|
|
vo.setTypeOne(vo.getTypeOne().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
|
|
|
});
|
|
|
}
|
|
|
- if (logisticsOrderStatistics.getTypeTwo().equals("2")){
|
|
|
+ if (logisticsOrderStatistics.getTypeTwo().equals("2")) {
|
|
|
list.forEach(vo -> {
|
|
|
- vo.setTypeOne(vo.getTypeOne().setScale(2,RoundingMode.HALF_UP));
|
|
|
+ vo.setTypeOne(vo.getTypeOne().setScale(2, RoundingMode.HALF_UP));
|
|
|
vo.setTypeTwo(vo.getTypeTwo().divide(new BigDecimal("10000")).setScale(2, RoundingMode.HALF_UP));
|
|
|
});
|
|
|
}
|
czh