diff --git a/src/main/java/com/chint/domain/factoriy/order_record/LyOrderRecordExtensionFactory.java b/src/main/java/com/chint/domain/factoriy/order_record/LyOrderRecordExtensionFactory.java index 0c47fcc4..b0bb8193 100644 --- a/src/main/java/com/chint/domain/factoriy/order_record/LyOrderRecordExtensionFactory.java +++ b/src/main/java/com/chint/domain/factoriy/order_record/LyOrderRecordExtensionFactory.java @@ -195,7 +195,53 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor OrderRecordBasic orderRecordBasic = getOrderRecordBasic(orderSerialNo); BeanUtils.copyProperties(orderRecordBasic, orderTrainRecord); orderTrainRecord.setDetailId(lyOrderTrainRecord.getBillOrderNo())//防重标识 - + .setTicketClerk(lyOrderTrainRecord.getReserveManName()) //票务员 + .setAccountPeriod(lyOrderTrainRecord.getStatementCode()) //账期号 + .setBillNo(lyOrderTrainRecord.getBillOrderNo()) //账单号 + .setOrderNo(lyOrderTrainRecord.getOrderSerialNo()) //订单号 + .setParentOrderNo("") //父级订单号 + .setOriginalOrderNo(lyOrderTrainRecord.getOriginOrderSerialNo()) //原始订单号 + .setReceiptsNum(lyOrderTrainRecord.getOutApplayOrderNo()) //关联申请单号 + .setStartDate(lyOrderTrainRecord.getPlanBeginDate()) //出发日期 + .setArriveDate(lyOrderTrainRecord.getPlanEndDate()) //到达日期 + .setOverStandard("是".equals(lyOrderTrainRecord.getOverStandardStatus()) ? "1" : "0") //"是否违规（超标）：0否 1是" + .setOverStandardReason(lyOrderTrainRecord.getViolationReason()) //违规原因（超标原因） + .setChangeAddAmount(String.valueOf(lyOrderTrainRecord.getToBePayAmount())) //改签收款 + .setChangeCost(String.valueOf(lyOrderTrainRecord.getChangeFee())) //改签手续费 + .setChangeReturnAmount(String.valueOf(lyOrderTrainRecord.getToBePayAmount())) //改签退款 + .setReturnCost(String.valueOf(lyOrderTrainRecord.getRefundFee())) //退款手续费 + .setBookFee(String.valueOf(lyOrderTrainRecord.getServiceAmount())) //订票手续费 + .setCollFee("") //取票手续费 + .setNoTaxFeeAmt("") //手续费未税金额 + .setTaxFeeAmt("") //手续费税费 + .setReturnRes(lyOrderTrainRecord.getRefundChangeReason()) //退票原因 + .setReturnFee(String.valueOf(lyOrderTrainRecord.getRefundFee())) //退票手续费 + .setNoTaxAmt("") //未税金额 + .setTaxAmt("") //税额 + .setOrderAmount(String.valueOf(lyOrderTrainRecord.getToBePayAmount())) //结算总额 + .setFromCity(lyOrderTrainRecord.getTripName()) //出发城市 + .setFromStationName(lyOrderTrainRecord.getTripName()) //出发站 + .setToCity(lyOrderTrainRecord.getTripName()) //到达城市 + .setToStationName(lyOrderTrainRecord.getTripName()) //到达站 + .setIssueTicketTime(lyOrderTrainRecord.getEnterAccount()) //出票时间 yyyy-MM-dd HH:mm:ss + .setRunTime("") //时长 + .setSeatType("")// 座位等级 + .setTrainNo(lyOrderTrainRecord.getTrainNo()) //车次 + .setUserCode(lyOrderTrainRecord.getPassengerNo())//出行人编码 + .setUserName(lyOrderTrainRecord.getPassengerName())//出行人姓名 + .setOrderSource(lyOrderTrainRecord.getBookingPlat())//预订来源：线上 / 线下 + .setBookOrgCode1(lyOrderTrainRecord.getPassengerDepartment())//出行人组织架构信息1 + .setBookOrgCode2("")//出行人组织架构信息2 + .setBookOrgCode3("")//出行人组织架构信息3 + .setOfflineCcomyCode(lyOrderTrainRecord.getPassengerCostCenter())//成本中心 + .setTravelUserBirthday("")//生日 + .setTravelUserPhone("") //出行人手机号 + .setTravelUserSex("")//"性别：0保密不展示 1男 2女" + .setTravelUserType("") //"乘客类型：成人(ADULT) 儿童(CHILDREN) 婴儿(BABY)" + .setPassportNo("")//乘客证件号 + .setPassportType("")//乘客证件类型 + .setTrainTime("")//发车时间 yyyy - MM - dd HH:mm:ss + .setYxId("")//影像比对ID ; } @@ -204,7 +250,47 @@ public class LyOrderRecordExtensionFactory implements OrderRecordExtensionFactor OrderRecordBasic orderRecordBasic = getOrderRecordBasic(orderSerialNo); BeanUtils.copyProperties(orderRecordBasic, orderCarRecord); orderCarRecord.setDetailId(lyOrderCarRecord.getBillOrderNo())//防重标识 - + .setTicketClerk(lyOrderCarRecord.getReserveManName()) //票务员 + .setAccountPeriod(lyOrderCarRecord.getStatementCode()) //账期号 + .setBillNo(lyOrderCarRecord.getBillOrderNo()) //账单号 + .setReceiptsNum(lyOrderCarRecord.getOrderSerialNo()) //关联申请单号 + .setOverStandard("0") //"是否违规（超标）：0否 1是" + .setOverStandardReason("无")//违规原因（超标原因） + .setOrderNo(lyOrderCarRecord.getOrderSerialNo()) //订单号 + .setParentOrderNo("")//父级订单号 + .setOriginalOrderNo(lyOrderCarRecord.getOriginOrderSerialNo())//原始订单号 + .setOrderStatus("") //"结算状态" + .setCreateTime(lyOrderCarRecord.getBookingDate()) //"订单创建时间格式：2023-04-26 13:15:17" + .setStartTime(lyOrderCarRecord.getPlanBeginDate()) //"出发时间格式：2023-04-26 13:15:17" + .setArriveTime("") //"到达时间格式：2023-04-26 13:15:17" + .setFromStationName(lyOrderCarRecord.getCarStartPlaceActual()) //出发地 + .setToStationName(lyOrderCarRecord.getCarEndPlaceActual()) //到达地 + .setCarType("") //车型 + .setFromCity(lyOrderCarRecord.getStartCityName()) //出发城市 + .setToCity("") //到达城市 + .setRunTime("") //运行时长 + .setMiles("") //里程数 + .setNoTaxAmt("") //未税金额 + .setTaxAmt("") //税费 + .setOrderAmount(String.valueOf(lyOrderCarRecord.getToBePayAmount())) //结算总额(含前收服务费) + .setOpenCharge("") //开票手续费 + .setHighSpeedAmt("") //额外费用 + .setHighSpeedName("") //额外费用名称 + .setServiceCost(String.valueOf(lyOrderCarRecord.getServiceAmount())) //服务费 + .setCancelCost(String.valueOf(lyOrderCarRecord.getToBePayAmount())) //取消费 + .setUserName(String.valueOf(lyOrderCarRecord.getPassengerName())) //用车人姓名 + .setUserCode(lyOrderCarRecord.getPassengerNo()) //用车人code +// .setOwnPayAmt() //个人支付金额 + .setComyPayAmt(String.valueOf(lyOrderCarRecord.getToBePayAmount())) //公司统付金额 + .setBookOrgCode1(lyOrderCarRecord.getPassengerDepartment()) //用车人组织架构信息1 + .setBookOrgCode2("") //用车人组织架构信息2 + .setBookOrgCode3("") //用车人组织架构信息3 + .setPaymentType(String.valueOf(getPaymentType(lyOrderCarRecord.getPayType()))) //"付款方式0：公司统付 1：个人付 2：混付" + .setOfflineCcomyCode(lyOrderCarRecord.getPassengerDepartment()) //成本中心 + .setOrderSource(lyOrderCarRecord.getBookingPlat()) //预订来源：线上/线下 +// .setORDER_AMOUNT() //订单金额 +// .setSETTLE_ORDER_FLAG() //订单对账状态 +// .setpayAmount()// 支付金额 ; }