提交 34dd35a9 authored 作者: 吕本才's avatar 吕本才

1、增加除法前的判断,除数是否为0

上级 d3a896be
package com.sfa.job.domain.order.dao.impl; package com.sfa.job.service.order.impl;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
......
...@@ -52,8 +52,10 @@ public class FinanceOrderSyncServiceImpl extends ServiceImpl<FinanceOrderMapper, ...@@ -52,8 +52,10 @@ public class FinanceOrderSyncServiceImpl extends ServiceImpl<FinanceOrderMapper,
CollectErrorInfoDao errorInfoDao; CollectErrorInfoDao errorInfoDao;
@Autowired @Autowired
IProductDao productDao; IProductDao productDao;
/** /**
* 多线程调用此方法 * 多线程调用此方法
*
* @param startTime * @param startTime
* @param endTime * @param endTime
*/ */
...@@ -74,7 +76,7 @@ public class FinanceOrderSyncServiceImpl extends ServiceImpl<FinanceOrderMapper, ...@@ -74,7 +76,7 @@ public class FinanceOrderSyncServiceImpl extends ServiceImpl<FinanceOrderMapper,
} }
// 调用查询旺店通接口api 获取最新日期前的一个小时 // 调用查询旺店通接口api 获取最新日期前的一个小时
startTime = DateUtils.addMinutes(startTime, -3); startTime = DateUtils.addMinutes(startTime, -3);
}else{ } else {
// 调用查询旺店通接口api 获取最新日期前的一个小时 // 调用查询旺店通接口api 获取最新日期前的一个小时
Date currentLatest = DateUtils.addHours(new Date(), -2); Date currentLatest = DateUtils.addHours(new Date(), -2);
if (currentLatest.compareTo(startTime) < 0) { if (currentLatest.compareTo(startTime) < 0) {
...@@ -159,8 +161,12 @@ public class FinanceOrderSyncServiceImpl extends ServiceImpl<FinanceOrderMapper, ...@@ -159,8 +161,12 @@ public class FinanceOrderSyncServiceImpl extends ServiceImpl<FinanceOrderMapper,
} }
orderDetail.setFlavorErp(ObjectUtils.isNotEmpty(baseProductMap.get(orderDetail.getGoodsNo())) ? baseProductMap.get(orderDetail.getGoodsNo()).getFlavor() : ""); orderDetail.setFlavorErp(ObjectUtils.isNotEmpty(baseProductMap.get(orderDetail.getGoodsNo())) ? baseProductMap.get(orderDetail.getGoodsNo()).getFlavor() : "");
orderDetail.setSpecNameErp(ObjectUtils.isNotEmpty(baseProductMap.get(orderDetail.getGoodsNo())) ? baseProductMap.get(orderDetail.getGoodsNo()).getSpec() : ""); orderDetail.setSpecNameErp(ObjectUtils.isNotEmpty(baseProductMap.get(orderDetail.getGoodsNo())) ? baseProductMap.get(orderDetail.getGoodsNo()).getSpec() : "");
orderDetail.setActualCost(ObjectUtils.isNotEmpty(baseProductMap.get(orderDetail.getGoodsNo())) ? baseProductMap.get(orderDetail.getGoodsNo()).getActualCost() : order.getGoodsCost().divide( order.getGoodsTypeCount()).setScale(4, BigDecimal.ROUND_HALF_UP)); orderDetail.setActualCost(ObjectUtils.isNotEmpty(baseProductMap.get(orderDetail.getGoodsNo())) ?
orderDetail.setStandardCost(ObjectUtils.isNotEmpty(baseProductMap.get(orderDetail.getGoodsNo())) ? baseProductMap.get(orderDetail.getGoodsNo()).getStandardCost() : order.getGoodsCost().divide( order.getGoodsTypeCount()).setScale(4, BigDecimal.ROUND_HALF_UP)); baseProductMap.get(orderDetail.getGoodsNo()).getActualCost():
(ObjectUtils.isNotEmpty(order.getGoodsTypeCount()) && !order.getGoodsTypeCount().equals(0)) ? order.getGoodsCost().divide(order.getGoodsTypeCount()).setScale(4, BigDecimal.ROUND_HALF_UP) : new BigDecimal(0));
orderDetail.setStandardCost(ObjectUtils.isNotEmpty(baseProductMap.get(orderDetail.getGoodsNo())) ?
baseProductMap.get(orderDetail.getGoodsNo()).getStandardCost() :
(ObjectUtils.isNotEmpty(order.getGoodsTypeCount()) && !order.getGoodsTypeCount().equals(0)) ? order.getGoodsCost().divide(order.getGoodsTypeCount()).setScale(4, BigDecimal.ROUND_HALF_UP) : new BigDecimal(0));
} }
mergeList.addAll(orderDetails); mergeList.addAll(orderDetails);
} }
...@@ -176,7 +182,7 @@ public class FinanceOrderSyncServiceImpl extends ServiceImpl<FinanceOrderMapper, ...@@ -176,7 +182,7 @@ public class FinanceOrderSyncServiceImpl extends ServiceImpl<FinanceOrderMapper,
detailDto.setEndTime(endTime); detailDto.setEndTime(endTime);
detailDto.setBatchNo(batchNo); detailDto.setBatchNo(batchNo);
log.info("插入订单和订单详情完成,批次{}开始时间{},结束时间{},订单数量:{},详情数量:{}",batchNo, DateUtil.formatDateTime(startTime), DateUtil.formatDateTime(endTime), orders.size(), mergeList.size()); log.info("插入订单和订单详情完成,批次{}开始时间{},结束时间{},订单数量:{},详情数量:{}", batchNo, DateUtil.formatDateTime(startTime), DateUtil.formatDateTime(endTime), orders.size(), mergeList.size());
CollectOrderLogInfo collectOrderLogInfo = new CollectOrderLogInfo(); CollectOrderLogInfo collectOrderLogInfo = new CollectOrderLogInfo();
collectOrderLogInfo.setSyncType(syncType); collectOrderLogInfo.setSyncType(syncType);
...@@ -188,7 +194,7 @@ public class FinanceOrderSyncServiceImpl extends ServiceImpl<FinanceOrderMapper, ...@@ -188,7 +194,7 @@ public class FinanceOrderSyncServiceImpl extends ServiceImpl<FinanceOrderMapper,
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
// 记录错误日志表 collect_error_info // 记录错误日志表 collect_error_info
CollectErrorInfo errorInfo =new CollectErrorInfo(); CollectErrorInfo errorInfo = new CollectErrorInfo();
errorInfo.setBatchNo(batchNo); errorInfo.setBatchNo(batchNo);
errorInfo.setType(""); errorInfo.setType("");
errorInfo.setErrorMsg(e.getMessage()); errorInfo.setErrorMsg(e.getMessage());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论