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

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsChangesRecordEntity.java

@@ -69,6 +69,7 @@ public class StatisticsChangesRecordEntity extends TenantEntity {
 	private BigDecimal thirdOprationFee;//三方操作费
 
 	private Date changesTime;//异动时间
+	private String changesUserName;//异动人
 
 	private Long statisticsWarehouseId;
 	private String statisticsWarehouseName;

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.logpm.statistics.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -80,6 +81,10 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 
 		List<StatisticsChangesRecordEntity> list = changesRecordService.list(queryWrapper);
 
+		if(list.isEmpty()){
+			return CollUtil.newArrayList();
+		}
+
 		//获取list中所有元素的id
 		List<Long> changesRecordIdList = list.stream().map(StatisticsChangesRecordEntity::getId).collect(Collectors.toList());
 
@@ -112,6 +117,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 
 		changesRecordEntity.setItemRecord(itemRecord);
 		changesRecordEntity.setChangesTime(CommonUtil.StringToDate(changesRecordDTO.getChangesTimeStr()));
+		changesRecordEntity.setChangesUserName(AuthUtil.getNickName());
 		changesRecordService.save(changesRecordEntity);
 
 		List<String> changesPhotoUrls = changesRecordDTO.getChangesPhotoUrls();
@@ -197,6 +203,13 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 
 
 		list.forEach(statisticsOrderInfoVO -> {
+			Long orderInfoId = statisticsOrderInfoVO.getOrderInfoId();
+			Integer confirmStatisticsOrder = statisticsOrderInfoVO.getConfirmStatisticsOrder();
+			if(confirmStatisticsOrder.equals(1)){
+				log.warn("############checkBalance: 订单id={} 已经确认对账",orderInfoId);
+				throw new CustomerException(405,"存在已经确认对账的订单");
+			}
+
 			brands.add(statisticsOrderInfoVO.getBrand());
 			waybillNos.add(statisticsOrderInfoVO.getWaybillNo());
 			orderCodes.add(statisticsOrderInfoVO.getOrderNo());