优化,order room订单号存

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -1864,9 +1864,11 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         if (routeRespDTO != null && routeRespDTO.getDirection() == 2) {
             code = "CY";
         }
-        String orderNo = ship.getCode() + "-" + date + "-" + code + "-" + (maxOrderNo + 1);
+        String orderNo;
         if (ship.getCode() == null) {
             orderNo = date + "-" + voyage.getCode() + "-" + (maxOrderNo + 1);
+        } else {
+            orderNo = ship.getCode() + "-" + date + "-" + code + "-" + (maxOrderNo + 1);
         }
 //        List<TradeOrderCountryReqVO> countryData = createVO.getCountryData();
         TradeOrderTotalVO summary = createVO.getSummary();
@@ -2049,6 +2051,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         roomModelList.forEach(roomModel -> {
             TradeOrderRoomModelDO tradeOrderRoomDO = BeanUtils.toBean(roomModel, TradeOrderRoomModelDO.class);
             tradeOrderRoomDO.setOrderId(orderId);
+            tradeOrderRoomDO.setOrderNo(orderNo);
             tradeOrderRoomDOList.add(tradeOrderRoomDO);
         });