|
|
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.yc.ship.framework.common.util.collection.CollectionUtils;
|
|
|
+import com.yc.ship.framework.common.util.collection.MapUtils;
|
|
|
import com.yc.ship.framework.common.util.object.BeanUtils;
|
|
|
import com.yc.ship.module.product.api.dto.OrderRoomUseDTO;
|
|
|
import com.yc.ship.module.product.api.dto.ReduceStockReqDTO;
|
|
|
@@ -678,18 +679,9 @@ public class VoyageApiImpl implements VoyageApi {
|
|
|
|
|
|
stockDetailList.forEach(item -> {
|
|
|
String key = item.getRoomModelId() + "_" + item.getFloor();
|
|
|
- BigDecimal totalNum = totalNumMap.get(key);
|
|
|
- if(totalNum == null) {
|
|
|
- totalNum = BigDecimal.ZERO;
|
|
|
- }
|
|
|
- BigDecimal realNum = realNumMap.get(key);
|
|
|
- if (realNum == null) {
|
|
|
- realNum = BigDecimal.ZERO;
|
|
|
- }
|
|
|
- BigDecimal virtualNum = virtualNumMap.get(key);
|
|
|
- if (virtualNum == null) {
|
|
|
- virtualNum = BigDecimal.ZERO;
|
|
|
- }
|
|
|
+ BigDecimal totalNum = MapUtils.getBigDecimal(totalNumMap, key);
|
|
|
+ BigDecimal realNum = MapUtils.getBigDecimal(realNumMap, key);
|
|
|
+ BigDecimal virtualNum = MapUtils.getBigDecimal(virtualNumMap, key);
|
|
|
item.setBookNum(item.getBookNum().subtract(totalNum));
|
|
|
item.setCanSellNum(item.getCanSellNum().add(totalNum));
|
|
|
item.setRealTotalNum(item.getRealTotalNum().add(realNum));
|