优化

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/api/VoyageApiImpl.java

@@ -2,7 +2,6 @@ package com.yc.ship.module.product.api;
 
 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;
@@ -598,8 +597,10 @@ public class VoyageApiImpl implements VoyageApi {
             roomUsedDO.setOrderId(orderId);
             roomUsedDO.setVoyageId(voyageId);
             OrderRoomUseDTO roomRespDTO = roomIdMap.get(item.getRoomId());
-            roomUsedDO.setRoomModelId(roomRespDTO.getRoomModelId());
-            roomUsedDO.setFloor(roomRespDTO.getFloor());
+            if(roomRespDTO!=null) {
+                roomUsedDO.setRoomModelId(roomRespDTO.getRoomModelId());
+                roomUsedDO.setFloor(roomRespDTO.getFloor());
+            }
             roomUsedDO.setRoomId(item.getRoomId());
             roomUsedDO.setNum(item.getNum());
             roomUsedDO.setStatus(orderStatus);
@@ -714,8 +715,9 @@ public class VoyageApiImpl implements VoyageApi {
                     if (item.getNum() == null) {
                         item.setNum(BigDecimal.ZERO);
                     }
-                    item.setNum(item.getNum().add(totalNumMap.get(key)));
-                    item.setBookNum(item.getBookNum().subtract(totalNumMap.get(key)));
+                    BigDecimal totalNum = MapUtils.getBigDecimal(totalNumMap, key);
+                    item.setNum(item.getNum().add(totalNum));
+                    item.setBookNum(item.getBookNum().subtract(totalNum));
                     if (item.getBookNum().compareTo(BigDecimal.ZERO) < 0) {
                         item.setBookNum(BigDecimal.ZERO);
                     }
@@ -749,7 +751,7 @@ public class VoyageApiImpl implements VoyageApi {
         //门店ID
         Long storeId = reqDTO.getStoreId();
         //总共使用房间数量
-        BigDecimal totalUseNum = reqDTO.getUseRoomNum();
+        BigDecimal totalUseNum = reqDTO.getUseRoomNum()==null?BigDecimal.ZERO:reqDTO.getUseRoomNum();
         Long orderId = reqDTO.getOrderId();
         Integer orderStatus = reqDTO.getOrderStatus();
 
@@ -1009,8 +1011,10 @@ public class VoyageApiImpl implements VoyageApi {
             roomUsedDO.setOrderId(orderId);
             roomUsedDO.setVoyageId(voyageId);
             OrderRoomUseDTO roomRespDTO = roomIdMap.get(item.getRoomId());
-            roomUsedDO.setRoomModelId(roomRespDTO.getRoomModelId());
-            roomUsedDO.setFloor(roomRespDTO.getFloor());
+            if(roomRespDTO!=null) {
+                roomUsedDO.setRoomModelId(roomRespDTO.getRoomModelId());
+                roomUsedDO.setFloor(roomRespDTO.getFloor());
+            }
             roomUsedDO.setRoomId(item.getRoomId());
             roomUsedDO.setNum(item.getNum());
             roomUsedDO.setStatus(orderStatus);

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderServiceImpl.java

@@ -256,12 +256,12 @@ public class TradeOrderServiceImpl implements TradeOrderService {
             try {
                 ExceptionUtils.log(log, "订单修改失败:", e);
                 handleAfterOrderCreateFail(e.getCode(), tradeOrderBO);
-            }catch (Exception eee){
+            }catch (Exception ignored){
 
             }
             return CommonResult.error(e);
         } catch (Exception e) {
-            log.error("订单修改失败：", e);
+            log.error("订单修改失败：{}", String.valueOf(e));
             return CommonResult.error(ORDER_MODIFY_FAIL);
         }
     }