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

src/main/java/com/chint/domain/factoriy/order_record/LyOrderRecordExtensionFactory.java

@@ -160,13 +160,10 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
         if (StringUtils.isBlank(orderFlightRecord.getOfflineCcomyCode()) && !Objects.isNull(routeOrder.getApproveOrderNo())) {
             orderFlightRecord.setOfflineCcomyCode(routeOrder.getApproveOrderNo().getCostCenter());
         }
+        //结算状态
+        orderFlightRecord.setOrderStatus(readOrderStatus(lyOrderFlightRecord.getOrderOperType()));
         //订单明细字段赋值
         setFlightRecordDetail(orderFlightRecord, orderDetail.getFlightOrderDetail(), orderSerialNo);
-
-        //结算状态
-        if (StringUtils.isBlank(orderFlightRecord.getOrderStatus())) {
-            orderFlightRecord.setOrderStatus(readOrderStatus(lyOrderFlightRecord.getOrderOperType()));//结算状态
-        }
         //组织架构
         setFlightOrganizational(orderFlightRecord, lyOrderFlightRecord);
 
@@ -190,8 +187,7 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
                     .setEndAirportName(flightOrderDetail.getEndAirportName())//到达机场名称
                     .setEndCityCode(flightOrderDetail.getEndCityCode())//到达城市编码
                     .setEndCityName(flightOrderDetail.getEndCityName())//到达城市名称
-                    .setEndTerminal(flightOrderDetail.getEndTerminal())//到达航站楼
+                    .setEndTerminal(flightOrderDetail.getEndTerminal());//到达航站楼
-                    .setOrderStatus(flightOrderDetail.getOrderStatus());//结算状态
         } else {
             LyOrderDetailFlightRecord lyOrderDetailFlightRecord = lyOrderDetailRecordFactory.queryFlightDetail(orderSerialNo);
             orderFlightRecord.setParentOrderNo(lyOrderDetailFlightRecord.getParentOrderNo())//父级订单号
@@ -273,7 +269,6 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
                 .setRoomTypeName(lyOrderHotelRecord.getBedType())    //房型
                 .setOrderSource(StringUtils.isNotBlank(lyOrderHotelRecord.getOutApplayOrderNo()) ? "Y" : "N")   //预订来源：线上/线下
                 .setBookOrgCode1(lyOrderHotelRecord.getPassengerDepartment())   //入住人组织架构信息1
-                .setOrderStatus("")    //结算状态
 //                .setExpenseOrderAmount("")    //订单金额
 //                .setSettleOrderFlag()    //订单对账状态
                 .setPayAmount(String.valueOf(lyOrderHotelRecord.getToBePayAmount()));//支付金额
@@ -281,12 +276,10 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
         if (StringUtils.isBlank(orderHotelRecord.getOfflineCcomyCode()) && !Objects.isNull(routeOrder.getApproveOrderNo())) {
             orderHotelRecord.setOfflineCcomyCode(routeOrder.getApproveOrderNo().getCostCenter());
         }
+        //结算状态
+        orderHotelRecord.setOrderStatus(readOrderStatus(lyOrderHotelRecord.getOrderOperType()));//结算状态
         //订单明细字段赋值
         setHotelRecordDetail(orderHotelRecord, orderDetail.getHotelOrderDetail(), orderSerialNo);
-        //结算状态
-        if (StringUtils.isBlank(orderHotelRecord.getOrderStatus())) {
-            orderHotelRecord.setOrderStatus(readOrderStatus(lyOrderHotelRecord.getOrderOperType()));//结算状态
-        }
         //组织架构
         setHotelOrganizational(orderHotelRecord, lyOrderHotelRecord);
 
@@ -307,8 +300,7 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
                     .setIsAgreement(hotelOrderDetail.getAgreementHotel()) //是否协议酒店：0否1是
                     .setPersonalAmount(hotelOrderDetail.getPersonalAmount())//个人支付金额
                     .setRoomCount(Integer.parseInt(StringUtils.isBlank(hotelOrderDetail.getRoomCount()) ? "1" : hotelOrderDetail.getRoomCount()))    //房间数
-                    .setStarRate(hotelOrderDetail.getStarRate())//星级
+                    .setStarRate(hotelOrderDetail.getStarRate());//星级
-                    .setOrderStatus(hotelOrderDetail.getOrderStatus());   //结算状态
         } else {
             LyOrderDetailHotelRecord lyOrderDetailHotelRecord = lyOrderDetailRecordFactory.queryHotelDetail(orderSerialNo);
             orderHotelRecord.setHotelAddress(lyOrderDetailHotelRecord.getHotelAddress()) //酒店地址
@@ -414,9 +406,6 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
                             .orElse(trainOrderDetail.getFromStationName())) // 出发站
                     .setToStationName(Optional.ofNullable(orderTrainRecord.getToStationName())
                             .orElse(trainOrderDetail.getToStationName())); // 到达站
-            if (StringUtils.isBlank(orderTrainRecord.getOrderStatus())) {
-                orderTrainRecord.setOrderStatus(trainOrderDetail.getOrderStatus());//结算状态
-            }
         } else {
             LyOrderDetailTrainRecord lyOrderDetailTrainRecord = lyOrderDetailRecordFactory.queryTrainDetail(orderSerialNo);
             orderTrainRecord.setParentOrderNo(lyOrderDetailTrainRecord.getParentOrderNo())//父级订单号
@@ -476,7 +465,6 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
                 .setOverStandardReason("无")//违规原因（超标原因）
                 .setOrderNo(lyOrderCarRecord.getOrderSerialNo())    //订单号
                 .setOriginalOrderNo(lyOrderCarRecord.getOriginOrderSerialNo())//原始订单号
-                .setOrderStatus("")    //"结算状态"
                 .setCreateTime(lyOrderCarRecord.getBookingDate())   //"订单创建时间格式：2023-04-26 13:15:17"
                 .setStartTime(lyOrderCarRecord.getPlanBeginDate())  //"出发时间格式：2023-04-26 13:15:17"
                 .setFromStationName(lyOrderCarRecord.getCarStartPlaceActual())   //出发地
@@ -504,12 +492,11 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor
         if (StringUtils.isBlank(orderCarRecord.getOfflineCcomyCode()) && !Objects.isNull(routeOrder.getApproveOrderNo())) {
             orderCarRecord.setOfflineCcomyCode(routeOrder.getApproveOrderNo().getCostCenter());
         }
+        //结算状态
+        orderCarRecord.setOrderStatus(readOrderStatus(lyOrderCarRecord.getOrderOperType()));
+
         //订单明细字段赋值
         setCarRecordDetail(orderCarRecord, orderDetail.getCarOrderDetail(), orderSerialNo);
-        //结算状态
-        if (StringUtils.isBlank(orderCarRecord.getOrderStatus())) {
-            orderCarRecord.setOrderStatus(readOrderStatus(lyOrderCarRecord.getOrderOperType()));//结算状态
-        }
         //组织架构
         setCarOrganizational(orderCarRecord, lyOrderCarRecord);