|
|
@@ -30,10 +30,7 @@ import com.yc.ship.framework.common.util.object.BeanUtils;
|
|
|
import com.yc.ship.module.product.dal.mysql.voyagestockdetail.VoyageStockDetailMapper;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Collections;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -249,7 +246,7 @@ public class VoyageStockDetailServiceImpl implements VoyageStockDetailService {
|
|
|
@Override
|
|
|
public VoyageStockDetailDO getVoyageStockTotalRow(Long voyageId) {
|
|
|
// 查询航次实际总库存数
|
|
|
- BigDecimal realTotalNum = voyageStockDetailMapper.selectRealTotalNumFromDistData(voyageId);
|
|
|
+ BigDecimal realTotalNum = Optional.ofNullable(voyageStockDetailMapper.selectRealTotalNumFromDistData(voyageId)).orElse(BigDecimal.ZERO);
|
|
|
// 查询已分配房间数（领队数 + 陪同数）/ 2
|
|
|
Double allocatedRoomCount = voyageStockDetailMapper.selectAllocatedRoomCountByVoyageId(voyageId);
|
|
|
BigDecimal allocatedRoomNum = BigDecimal.valueOf(allocatedRoomCount != null ? allocatedRoomCount : 0);
|
