同步代码
This commit is contained in:
lulz1
parent
0baf1f1db5
commit
7b488daa36
|
|
@ -37,6 +37,8 @@ public class OrderDetailQuery {
|
|||
List<RouteOrder> byEmployeeNo = routeRepository.findByEmployeeNo(currentUser.getEmployeeNo());
|
||||
Stream<OrderDetail> details = byEmployeeNo
|
||||
.stream()
|
||||
.filter(it->it.getApproveOrderNo() != null && it.getApproveOrderNo().getActualOrderNo() != null)
|
||||
.filter(it->it.getOrderDetails() != null)
|
||||
.flatMap(it -> it.getOrderDetails().stream());
|
||||
|
||||
List<Integer> productTypes = orderDetailQueryParam.getProductTypes();
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ import com.chint.interfaces.rest.ctrip.dto.search.ItineraryEntity;
|
|||
import com.chint.interfaces.rest.ctrip.dto.search.SearchOrderResponse;
|
||||
import com.chint.interfaces.rest.ctrip.dto.search.car.BasicInfo;
|
||||
import com.chint.interfaces.rest.ctrip.dto.search.car.CarOrderInfoEntity;
|
||||
import com.chint.interfaces.rest.ctrip.dto.search.car.CarQuickOrderInfoEntity;
|
||||
import com.chint.interfaces.rest.ctrip.dto.search.car.OrderProduct;
|
||||
import com.chint.interfaces.rest.ctrip.dto.search.flight.FlightInfo;
|
||||
import com.chint.interfaces.rest.ctrip.dto.search.flight.FlightOrderInfoEntity;
|
||||
|
|
@ -117,9 +118,9 @@ public class CTripOrderDataAdapter implements OrderDataAdapter {
|
|||
}
|
||||
|
||||
// 处理租车订单
|
||||
List<CarOrderInfoEntity> carOrderInfoList = itineraryEntity.getCarOrderInfoList();
|
||||
List<CarQuickOrderInfoEntity> carOrderInfoList = itineraryEntity.getCarQuickOrderInfoList();
|
||||
if (carOrderInfoList != null && carOrderInfoList.size() == 1) {
|
||||
CarOrderInfoEntity carOrderInfo = carOrderInfoList.get(0);
|
||||
CarQuickOrderInfoEntity carOrderInfo = carOrderInfoList.get(0);
|
||||
OrderProduct orderProduct = carOrderInfo.getOrderProduct();
|
||||
BasicInfo basicInfo = carOrderInfo.getBasicInfo();
|
||||
Location departCityName = locationRepository.findByCityNameAndLevelThree(orderProduct.getDepartAddress().getCityName()).get(0);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
package com.chint.infrastructure.constant;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
public class LegConstant {
|
||||
|
||||
public static final int LEG_CHANGE_MAX_NUM = 2;
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
package com.chint.interfaces.rest.ctrip.dto.search;
|
||||
|
||||
public class CarQuickOrderInfoEntity {
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
package com.chint.interfaces.rest.ctrip.dto.search;
|
||||
|
||||
import com.chint.interfaces.rest.ctrip.dto.search.car.CarOrderInfoEntity;
|
||||
import com.chint.interfaces.rest.ctrip.dto.search.car.CarQuickOrderInfoEntity;
|
||||
import com.chint.interfaces.rest.ctrip.dto.search.flight.FlightOrderInfoEntity;
|
||||
import com.chint.interfaces.rest.ctrip.dto.search.hotel.HotelOrderInfoEntity;
|
||||
import com.chint.interfaces.rest.ctrip.dto.search.train.TrainOrderInfoEntity;
|
||||
|
|
|
|||
|
|
@ -16,6 +16,41 @@ public class BasicInfo {
|
|||
private String FeeType; // 费用类型
|
||||
private String UID; // 用户ID
|
||||
private String CreateTime;
|
||||
|
||||
private String PreEmployeeName;
|
||||
private String PreEmployeeID;
|
||||
private String PolicyId;
|
||||
private String CorpId;
|
||||
private String CorpName;
|
||||
private int AccountId;
|
||||
private int SubAccountId;
|
||||
private String ContactName;
|
||||
private String IntlCode;
|
||||
private String ContactMobile;
|
||||
private String ContactEmail;
|
||||
private boolean NeedInvoice;
|
||||
private int ExtraOrders;
|
||||
private String CostCenter1;
|
||||
private String CostCenter2;
|
||||
private String CostCenter3;
|
||||
private String CostCenter4;
|
||||
private String CostCenter5;
|
||||
private String CostCenter6;
|
||||
private String JourneyReason;
|
||||
private String Project;
|
||||
private String JouneryID;
|
||||
private String JourneyID; // Note: "JouneryID" and "JourneyID" seem redundant, consider keeping one.
|
||||
private String DefineValue1;
|
||||
private String DefineValue2;
|
||||
private String ServerFrom;
|
||||
private Boolean IsOfficialCard; // Using Boolean to allow null value
|
||||
private double AccntAmount;
|
||||
private double PersonAmount;
|
||||
private double WaitPayAmount;
|
||||
private String PlatformOrderId;
|
||||
private double DockingVendorPlatform;
|
||||
private String DockingVendorPlatformAccount;
|
||||
private String CorpDockingInfoList; // Assuming string representation, adjust based on actual structure
|
||||
private String PreEmployeeNamePinYin;
|
||||
private String SubProductLine;
|
||||
// Other fields and getters/setters
|
||||
}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
package com.chint.interfaces.rest.ctrip.dto.search.car;
|
||||
|
||||
import com.chint.interfaces.rest.ctrip.dto.search.car.*;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class CarQuickOrderInfoEntity {
|
||||
private BasicInfo BasicInfo; // 基本信息
|
||||
private OrderProduct OrderProduct; // 订单产品
|
||||
// private List<OrderFee> OrderFeeList; // 订单费用列表
|
||||
// private OrderInsurance OrderInsurance; // 订单保险信息
|
||||
// private OrderInvoice OrderInvoice; // 订单发票信息
|
||||
// private PassengerInfo PassengerInfo; // 乘客信息
|
||||
// private List<PaymentInfo> PaymentInfoList; // 支付信息列表
|
||||
// private List<PaymentSettlement> PaymentSettlementList; // 支付结算列表
|
||||
// private List<ChoosedVehicle> ChoosedVehicleList; // 选择的车辆列表
|
||||
// private OrderConfigInfo OrderConfigInfo; // 订单配置信息
|
||||
// private List<PaymentSupply> PaymentSupplyList; // 支付供应列表
|
||||
// private OrderPaymentInfo OrderPaymentInfo; // 订单支付信息
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@ import lombok.Data;
|
|||
// 选择的车辆信息类
|
||||
@Data
|
||||
class ChoosedVehicle {
|
||||
private double estimateAmount; // 预估金额
|
||||
private double EstimateAmount; // 预估金额
|
||||
private int vehicleId; // 车辆ID
|
||||
private String vehicleName; // 车辆名称
|
||||
// Other fields and getters/setters
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ class OrderFee {
|
|||
private String costScene; // 费用场景
|
||||
private String feeTypeCode; // 费用类型编码
|
||||
private String feeName; // 费用名称
|
||||
private double amount; // 金额
|
||||
private String amount; // 金额
|
||||
private String orderFeeId; // 订单费用ID
|
||||
// Other fields and getters/setters
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@ import lombok.Data;
|
|||
// 支付信息类
|
||||
@Data
|
||||
public class PaymentInfo {
|
||||
private double amount; // 金额
|
||||
private String amount; // 金额
|
||||
private String billNo; // 账单号
|
||||
private String paidTime; // 支付时间
|
||||
private String paymentCategory; // 支付类别
|
||||
|
|
|
|||
Loading…
Reference in New Issue