新增加三方业务流程代码

Pu Zhibing

2025-08-01 92b69ed3586357e8c2f80980590b1b3fb90192c5

新增加三方业务流程代码

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java

@@ -25,6 +25,7 @@
import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.ModifyTravelItineraryRequest;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.QYTPaymentCallback;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.QYTPaymentCallbackData;
import com.stylefeng.guns.modular.system.warpper.*;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.model.PaymentRecord;
@@ -2141,7 +2142,28 @@
    @PostMapping("/base/order/qytPaymentCallback")
    public String qytPaymentCallback(@RequestBody QYTPaymentCallback qytPaymentCallback) {
        log.info("【黔云通支付回调通知】请求参数:" + JSON.toJSONString(qytPaymentCallback));
        if (null == qytPaymentCallback) {
        try {
            if (null == qytPaymentCallback) {
                return "error";
            }
            QYTPaymentCallbackData data = qytPaymentCallback.getData();
            if("1".equals(data.getStatus())){
                return "error";
            }
            String partnerPayId = data.getPartnerPayId();
            String payId = data.getPayId();
            //网约车
            if(partnerPayId.contains("PR")){
                partnerPayId = partnerPayId.substring(2);
                orderPrivateCarService.payOrderPrivateCarCallback(Integer.valueOf(partnerPayId), payId, 1);
            }
            //出租车
            if(partnerPayId.contains("TA")){
                partnerPayId = partnerPayId.substring(2);
                orderTaxiService.payOrderTaxiCallback(Integer.valueOf(partnerPayId), payId, 1, 0);
            }
        }catch (Exception e){
            e.printStackTrace();
            return "error";
        }
        return "success";

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java

@@ -7,21 +7,23 @@
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.model.Company;
import com.stylefeng.guns.modular.system.model.Driver;
import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.service.IUserCouponRecordService;
import com.stylefeng.guns.modular.system.service.IUserInfoService;
import com.stylefeng.guns.modular.system.service.IUserMerchantCouponService;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.SMSUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -46,6 +48,8 @@
    
    @Autowired
    private IOrderPrivateCarService orderPrivateCarService;
    @Autowired
    private IPaymentRecordService paymentRecordService;
    
    
    @Autowired
@@ -63,6 +67,11 @@
    @Autowired
    private IUserInfoService userInfoService;
    
    @Autowired
    private IDriverService driverService;
    @Autowired
    private ICompanyService companyService;
	
    
    /**
     * 每隔一分钟去处理的定时任务
@@ -75,7 +84,7 @@
            //修改过期的商家优惠券
            userMerchantCouponService.updateExpired();
            //处理超时未支付的订单
			
            timoutNoPayment();
        } catch (Exception e) {
            e.printStackTrace();
        }
@@ -135,35 +144,165 @@
        List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("state", 7)
                .eq("isDelete", 1).eq("recoveryOrder", 0).last(" and now() >= DATE_ADD(insertTime, INTERVAL 24 HOUR)"));
        for (OrderPrivateCar orderPrivateCar : orderPrivateCars) {
            //使用备付金进行支付订单
            TradePayOffData tradePayOffData = new TradePayOffData();
            tradePayOffData.setPartnerPayId("PR" + orderPrivateCar.getId());
            tradePayOffData.setTotalFee(Double.valueOf(orderPrivateCar.getOrderMoney() * 100).intValue() + "");
            tradePayOffData.setOrderDesc("完成订单");
            PayInfo payInfo = OrderUtil.tradePayOff(tradePayOffData);
            String retCode = payInfo.getRetCode();
            if(!"000000".equals(retCode)){
                log.error("备付金支付失败：{}", payInfo.getRetMsg());
                continue;
            try {
                //使用备付金进行支付订单
                TradePayOffData tradePayOffData = new TradePayOffData();
                tradePayOffData.setPartnerPayId(orderPrivateCar.getTravelId());
                tradePayOffData.setTotalFee(Double.valueOf(orderPrivateCar.getOrderMoney() * 100).intValue() + "");
                tradePayOffData.setOrderDesc("完成订单");
                PayInfo payInfo = OrderUtil.tradePayOff(tradePayOffData);
                String retCode = payInfo.getRetCode();
                if (!"000000".equals(retCode)) {
                    log.error("备付金支付失败：{}", payInfo.getRetMsg());
                    continue;
                }
                PayInfoData data = payInfo.getData();
                String status = data.getStatus();
                if ("3".equals(status)) {
                    log.error("备付金支付失败：{}", payInfo.getRetMsg());
                    continue;
                }
                //查询三方订单状态
                Driver driver1 = driverService.selectById(orderPrivateCar.getDriverId());
                Company company = companyService.selectById(driver1.getCompanyId());
                UserInfo userInfo1 = userInfoService.selectById(orderPrivateCar.getUserId());
                GetTravelItineraryListRequest request = new GetTravelItineraryListRequest();
                request.setCustomerId(userInfo1.getOnconUUID());
                request.setOrderNo("PR" + orderPrivateCar.getId());
                request.setDriverId(driver1.getEmpId().toString());
                ListPage<List<TravelItinerary>> travelItineraryList = OrderUtil.getTravelItineraryList(request);
                Integer status1 = travelItineraryList.getList().get(0).getStatus();
                if(8 != status1){
                    //中台修改订单状态
                    ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
                    request1.setOrderId(orderPrivateCar.getTravelId());
                    request1.setStatus(8);
                    if (null != orderPrivateCar.getDriverId()) {
                        request1.setDriverId(driver1.getEmpId().toString());
                        request1.setSupplierShopId(company.getEnterCode());
                    }
                    if (2 == orderPrivateCar.getPromotion()) {
                        Driver driver2 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
                        request1.setPromoterId(driver2.getEmpId().toString());
                    }
                    OrderUtil.modifyTravelItinerary(request1);
                }
				
                String payId = payInfo.getData().getPayId();
                //copy原始订单后生成追缴单
                OrderPrivateCar orderPrivateCar1 = new OrderPrivateCar();
                BeanUtils.copyProperties(orderPrivateCar, orderPrivateCar1);
                orderPrivateCar1.setId(null);
                orderPrivateCar1.setRecoveryOrder(1);
				
                //修改原始订单为支付状态
                orderPrivateCar.setState(8);
                orderPrivateCar.setPayType(5);
                orderPrivateCar.setPayMoney(orderPrivateCar.getOrderMoney());
                orderPrivateCarService.updateById(orderPrivateCar);
                //添加三方支付记录
                paymentRecordService.saveData(1, orderPrivateCar.getUserId(), 1, orderPrivateCar.getId(), 1, 3, orderPrivateCar.getOrderMoney(), payId, 2);
				
				
                Driver driver = driverService.selectById(orderPrivateCar1.getDriverId());
                UserInfo userInfo = userInfoService.selectById(orderPrivateCar1.getUserId());
                //调用三方创建订单
                CreateOrderRequest createOrderRequest = new CreateOrderRequest();
                createOrderRequest.setTreatShopId(driver.getEmpId().toString());
                createOrderRequest.setField1("{\"profitSharing\":\"0\",\"isPromote\":\"0\"}");
                createOrderRequest.setCharge(new BigDecimal(orderPrivateCar1.getOrderMoney()));
                createOrderRequest.setOrderNo("PR" + orderPrivateCar1.getId());
                createOrderRequest.setCustomerId(userInfo.getOnconUUID());
                OrderInfo orderInfo = OrderUtil.tradeOrderCreate(createOrderRequest);
                orderPrivateCar1.setTravelId(orderInfo.getOrderId());
                orderPrivateCar1.setIsCreated(1);
                //保存追缴单
                orderPrivateCarService.insert(orderPrivateCar1);
            } catch (Exception e) {
                e.printStackTrace();
            }
            PayInfoData data = payInfo.getData();
            String status = data.getStatus();
            if("3".equals(status)){
                log.error("备付金支付失败：{}", payInfo.getRetMsg());
                continue;
        }
		
        //出租车
        List<OrderTaxi> orderTaxis = orderTaxiService.selectList(new EntityWrapper<OrderTaxi>().eq("state", 7)
                .eq("isDelete", 1).eq("recoveryOrder", 0).last(" and now() >= DATE_ADD(insertTime, INTERVAL 24 HOUR)"));
        for (OrderTaxi orderTaxi : orderTaxis) {
            try {
                //使用备付金进行支付订单
                TradePayOffData tradePayOffData = new TradePayOffData();
                tradePayOffData.setPartnerPayId(orderTaxi.getTravelId());
                tradePayOffData.setTotalFee(Double.valueOf(orderTaxi.getOrderMoney() * 100).intValue() + "");
                tradePayOffData.setOrderDesc("完成订单");
                PayInfo payInfo = OrderUtil.tradePayOff(tradePayOffData);
                String retCode = payInfo.getRetCode();
                if (!"000000".equals(retCode)) {
                    log.error("备付金支付失败：{}", payInfo.getRetMsg());
                    continue;
                }
                PayInfoData data = payInfo.getData();
                String status = data.getStatus();
                if ("3".equals(status)) {
                    log.error("备付金支付失败：{}", payInfo.getRetMsg());
                    continue;
                }
                //查询三方订单状态
                Driver driver1 = driverService.selectById(orderTaxi.getDriverId());
                Company company = companyService.selectById(driver1.getCompanyId());
                UserInfo userInfo1 = userInfoService.selectById(orderTaxi.getUserId());
                GetTravelItineraryListRequest request = new GetTravelItineraryListRequest();
                request.setCustomerId(userInfo1.getOnconUUID());
                request.setOrderNo("TA" + orderTaxi.getId());
                request.setDriverId(driver1.getEmpId().toString());
                ListPage<List<TravelItinerary>> travelItineraryList = OrderUtil.getTravelItineraryList(request);
                Integer status1 = travelItineraryList.getList().get(0).getStatus();
                if(8 != status1){
                    //中台修改订单状态
                    ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
                    request1.setOrderId(orderTaxi.getTravelId());
                    request1.setStatus(8);
                    if (null != orderTaxi.getDriverId()) {
                        request1.setDriverId(driver1.getEmpId().toString());
                        request1.setSupplierShopId(company.getEnterCode());
                    }
                    if (2 == orderTaxi.getPromotion()) {
                        Driver driver2 = driverService.selectById(orderTaxi.getPromotionDriverId());
                        request1.setPromoterId(driver2.getEmpId().toString());
                    }
                    OrderUtil.modifyTravelItinerary(request1);
                }
				
                String payId = payInfo.getData().getPayId();
                //copy原始订单后生成追缴单
                OrderTaxi orderTaxi1 = new OrderTaxi();
                BeanUtils.copyProperties(orderTaxi, orderTaxi1);
                orderTaxi1.setId(null);
                orderTaxi1.setRecoveryOrder(1);
				
                //修改原始订单为支付状态
                orderTaxi.setState(8);
                orderTaxi.setPayType(5);
                orderTaxi.setPayMoney(orderTaxi.getOrderMoney());
                orderTaxiService.updateById(orderTaxi);
                //添加三方支付记录
                paymentRecordService.saveData(1, orderTaxi.getUserId(), 1, orderTaxi.getId(), 2, 3, orderTaxi.getOrderMoney(), payId, 2);
				
                Driver driver = driverService.selectById(orderTaxi1.getDriverId());
                UserInfo userInfo = userInfoService.selectById(orderTaxi1.getUserId());
                //调用三方创建订单
                CreateOrderRequest createOrderRequest = new CreateOrderRequest();
                createOrderRequest.setTreatShopId(driver.getEmpId().toString());
                createOrderRequest.setField1("{\"profitSharing\":\"0\",\"isPromote\":\"0\"}");
                createOrderRequest.setCharge(new BigDecimal(orderTaxi1.getOrderMoney()));
                createOrderRequest.setOrderNo("TA" + orderTaxi1.getId());
                createOrderRequest.setCustomerId(userInfo.getOnconUUID());
                OrderInfo orderInfo = OrderUtil.tradeOrderCreate(createOrderRequest);
                orderTaxi1.setTravelId(orderInfo.getOrderId());
                orderTaxi1.setIsCreated(1);
                //保存追缴单
                orderTaxiService.insert(orderTaxi1);
            } catch (Exception e) {
                e.printStackTrace();
            }
            //copy原始订单后生成追缴单
            OrderPrivateCar orderPrivateCar1 = new OrderPrivateCar();
            BeanUtils.copyProperties(orderPrivateCar, orderPrivateCar1);
            orderPrivateCar1.setId(null);
            orderPrivateCar1.setRecoveryOrder(1);
			
            //修改原始订单为支付状态
            orderPrivateCar.setState(8);
            orderPrivateCar.setPayType(5);
            orderPrivateCar.setPayMoney(orderPrivateCar.getOrderMoney());
            orderPrivateCarService.updateById(orderPrivateCar);
            orderPrivateCarService.insert(orderPrivateCar1);
        }
    }
}

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java

@@ -180,6 +180,7 @@
     */
    public static PayInfo tradePayOff1(TradePayOff1Data tradePayOff1Data) {
        tradePayOff1Data.setPartnerId("5400004");
        tradePayOff1Data.setTimeout("72H");
        tradePayOff1Data.setScene("TRAFFIC");
        tradePayOff1Data.setCurrency("RMB");
        tradePayOff1Data.setNeedLoginFlag("N");
@@ -317,7 +318,10 @@
     * @param request
     * @return
     */
    public static ListPage<TravelItinerary> getTravelItineraryList(GetTravelItineraryListRequest request){
    public static ListPage<List<TravelItinerary>> getTravelItineraryList(GetTravelItineraryListRequest request){
        request.setScene("TRAFFIC");
        request.setPartnerId("522700");
		
        //请求路径
        String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/getTravelItineraryList";
        //私钥文件
@@ -357,7 +361,7 @@
            TravelItinerary object = list.getObject(i, TravelItinerary.class);
            travelItineraryList.add(object);
        }
        ListPage listPage = new ListPage<TravelItinerary>();
        ListPage listPage = new ListPage<List<TravelItinerary>>();
        listPage.setTotal(total);
        listPage.setPageNum(pageNum);
        listPage.setPageSize(pageSize);
@@ -374,6 +378,7 @@
    public static TradeOrderCreate tradeOrderCreate1(TradeOrderCreateData tradeOrderCreateData) {
        tradeOrderCreateData.setScene("TRAFFIC");
        tradeOrderCreateData.setPartnerId("522700");
        tradeOrderCreateData.setTimeout("72H");
        tradeOrderCreateData.setOrderAppId("52270015");
        tradeOrderCreateData.setChannelSource("GRJYCXWXXCX");
        tradeOrderCreateData.setPayPartnerId("5400004");
@@ -437,6 +442,11 @@
     * @return
     */
    public static OrderInfo tradeOrderCreate(CreateOrderRequest createOrderRequest) {
        createOrderRequest.setOrderAppId("52270015");
        createOrderRequest.setScene("TRAFFIC");
        createOrderRequest.setPartnerId("522700");
        createOrderRequest.setChannelSource("GRJYCXWXXCX");
		
        TradeRequest request = new TradeRequest<CreateOrderRequest>();
        request.setSceneId(QianYunTongProperties.sceneId);
        request.setAppId(QianYunTongProperties.appkey);
@@ -485,6 +495,7 @@
     */
    public static PayInfo tradePayOff(TradePayOffData tradePayOffData) {
        tradePayOffData.setPartnerId("5400004");
        tradePayOffData.setTimeout("72H");
        tradePayOffData.setScene("TRAFFIC");
        tradePayOffData.setCurrency("RMB");
        tradePayOffData.setRetUrl("");

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/CreateOrderRequest.java

@@ -39,10 +39,6 @@
     */
    private String channelSource;
    /**
     * 行程单ID
     */
    private String orderId;
    /**
     * 业务侧订单号
     */
    private String orderNo;

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradeOrderCreateData.java

@@ -28,6 +28,10 @@
     */
    private String partnerId;
    /**
     * 超时时间
     */
    private String timeout;
    /**
     * 结算信息json串。其中结算分账标识（profitSharing：0：不分账，1：分账）、是否推广单标识（isPromote：1、是、0、否）必传。例：{"profitSharing":"0",”isPromote”:”0”}
     */
    private String field1;

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradePayOff1Data.java

@@ -15,6 +15,10 @@
     */
    private String partnerId;
    /**
     * 超时时间
     */
    private String timeout;
    /**
     * 场景标识。交通场景传”TRAFFIC”
     */
    private String scene;

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradePayOffData.java

@@ -15,6 +15,10 @@
     */
    private String partnerId;
    /**
     * 超时时间
     */
    private String timeout;
    /**
     * 场景标识。交通场景传”TRAFFIC”
     */
    private String scene;

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java

@@ -13,1130 +13,1149 @@
 */
@TableName("t_order_taxi")
public class OrderTaxi {
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    @TableField("id")
    private Integer id;
    /**
     * 订单类型（1=普通订单，2=摆渡订单）
     */
    @TableField("type")
    private Integer type;
    /**
     * 跨城订单id(摆渡车专用)
     */
    @TableField("crossCityOrderId")
    private Integer crossCityOrderId;
    /**
     * 摆渡方位（1=跨城起点，2=跨城终点）
     */
    @TableField("place")
    private Integer place;
    /**
     * 用户id
     */
    @TableField("userId")
    private Integer userId;
    /**
     * 司机id
     */
    @TableField("driverId")
    private Integer driverId;
    /**
     * 车辆id
     */
    @TableField("carId")
    private Integer carId;
    /**
     * 订单号
     */
    @TableField("orderNum")
    private String orderNum;
    /**
     * 下单地点经度
     */
    @TableField("placementLon")
    private Double placementLon;
    /**
     * 下单地点纬度
     */
    @TableField("placementLat")
    private Double placementLat;
    /**
     * 下单地点
     */
    @TableField("placementAddress")
    private String placementAddress;
    /**
     * 起点经度
     */
    @TableField("startLon")
    private Double startLon;
    /**
     * 起点纬度
     */
    @TableField("startLat")
    private Double startLat;
    /**
     * 起点
     */
    @TableField("startAddress")
    private String startAddress;
    /**
     * 目的地经度
     */
    @TableField("endLon")
    private Double endLon;
    /**
     * 目的地纬度
     */
    @TableField("endLat")
    private Double endLat;
    /**
     * 目的地
     */
    @TableField("endAddress")
    private String endAddress;
    /**
     * 上车点经度
     */
    @TableField("boardingLon")
    private Double boardingLon;
    /**
     * 上车点纬度
     */
    @TableField("boardingLat")
    private Double boardingLat;
    /**
     * 上车地点
     */
    @TableField("boardingAddress")
    private String boardingAddress;
    /**
     * 上车时间
     */
    @TableField("boardingTime")
    private Date boardingTime;
    /**
     * 下车点经度
     */
    @TableField("getoffLon")
    private Double getoffLon;
    /**
     * 下车点纬度
     */
    @TableField("getoffLat")
    private Double getoffLat;
    /**
     * 下车点
     */
    @TableField("getoffAddress")
    private String getoffAddress;
    /**
     * 下车时间
     */
    @TableField("getoffTime")
    private Date getoffTime;
    /**
     * 行驶里程数（米）
     */
    @TableField("mileage")
    private Double mileage;
    /**
     * 支付方式（1=OK平台支付，2=其他方式支付）
     */
    @TableField("payManner")
    private Integer payManner;
    /**
     * 支付方式（1=微信，2=支付宝，3=余额）
     */
    @TableField("payType")
    private Integer payType;
    /**
     * 订单金额
     */
    @TableField("orderMoney")
    private Double orderMoney;
    /**
     * 行程费
     */
    @TableField("travelMoney")
    private Double travelMoney;
    /**
     * 停车费
     */
    @TableField("parkMoney")
    private Double parkMoney;
    /**
     * 过路费
     */
    @TableField("roadTollMoney")
    private Double roadTollMoney;
    /**
     * 小费
     */
    @TableField("tipMoney")
    private Double tipMoney;
    //节假费
    @TableField("holidayFee")
    private Double holidayFee;
    /**
     * 红包抵扣金额
     */
    @TableField("redPacketMoney")
    private Double redPacketMoney;
    /**
     * 优惠券抵扣金额
     */
    @TableField("couponMoney")
    private Double couponMoney;
    /**
     * 红包id
     */
    @TableField("redPacketId")
    private Integer redPacketId;
    /**
     * 优惠券id
     */
    @TableField("couponId")
    private Integer couponId;
    /**
     * 折扣
     */
    @TableField("discount")
    private Double discount;
    /**
     * 折扣优惠金额
     */
    @TableField("discountMoney")
    private Double discountMoney;
    /**
     * 折扣活动id
     */
    @TableField("activityId")
    private Integer activityId;
    /**
     * 打折卡id
     */
    @TableField("taxiCardId")
    private Integer taxiCardId;
    /**
     * 打车卡记录id
     */
    @TableField("userTaxiCardId")
    private Integer userTaxiCardId;
    /**
     * 优惠金额
     */
    @TableField("discountAmount")
    private Double discountAmount;
    /**
     * 公司id
     */
    @TableField("companyId")
    private Integer companyId;
    /**
     * 支付金额
     */
    @TableField("payMoney")
    private Double payMoney;
    //感谢费
    @TableField("thankYouFee")
    private Double thankYouFee;
    /**
     * 是否是代下单（0：否，1：是）
     */
    @TableField("substitute")
    private Integer substitute;
    /**
     * 乘车人姓名
     */
    @TableField("passengers")
    private String passengers;
    /**
     * 乘车人电话
     */
    @TableField("passengersPhone")
    private String passengersPhone;
    /**
     * 订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付）
     */
    @TableField("state")
    private Integer state;
    /**
     * 下单时间
     */
    @TableField("insertTime")
    private Date insertTime;
    /**
     * 出行时间
     */
    @TableField("travelTime")
    private Date travelTime;
    /**
     * 抢单时间
     */
    @TableField("snatchOrderTime")
    private Date snatchOrderTime;
    /**
     * 司机点出发时间
     */
    @TableField("setOutTime")
    private Date setOutTime;
    /**
     * 司机到达预约地点时间
     */
    @TableField("arriveTime")
    private Date arriveTime;
    /**
     * 开始服务时间
     */
    @TableField("startServiceTime")
    private Date startServiceTime;
    /**
     * 结束服务时间
     */
    @TableField("endServiceTime")
    private Date endServiceTime;
    /**
     * 订单类型（1=普通，2=预约）
     */
    @TableField("orderType")
    private Integer orderType;
    /**
     * 订单来源(1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单，6：道行龙城下单)
     */
    @TableField("orderSource")
    private Integer orderSource;
    /**
     * 发票id
     */
    @TableField("invoiceId")
    private Integer invoiceId;
    /**
     * 是否是改派单（1=否，=是）
     * @return
     */
    @TableField("isReassign")
    private Integer isReassign;
    /**
     * 改派通知标识（0=没有改派，1=改派中，2=已改派）用于通知前端获取新司机数据
     */
    @TableField("reassignNotice")
    private Integer reassignNotice;
    /**
     * 高德猎鹰轨迹id
     * @return
     */
    @TableField("trackId")
    private String trackId;
    /**
     * 是否删除（1=否，2=是）
     */
    @TableField("isDelete")
    private Integer isDelete;
    /**
     * 该派前的订单状态
     * @return
     */
    @TableField("oldState")
    private Integer oldState;
    /**
     * 移动小号
     * @return
     */
    @TableField("telX")
    private String telX;
    /**
     * 绑定小号关系id
     * @return
     */
    @TableField("bindId")
    private String bindId;

    /**
     * 是否异常订单 1否 2是
     */
    @TableField("abnormal")
    private Integer abnormal;


    /**
     * 乘客反馈情况
     */
    @TableField("abnormalIntro")
    private String abnormalIntro;

    /**
     * 乘客反馈图片
     */
    @TableField("abnormalImg")
    private String abnormalImg;


    private Integer promotionDriverId;

    private BigDecimal promotionMoney;


    private String splitAllocation;

    private Integer responsibilityType;
    
    
    private Integer promotion;
    
    private String voice;
    
    
    private Date voiceTime;
    
    private String promotionUser;
    
    private String promotionPhone;
    
    private String travelId;
    /**
     * 中台是否已创建订单（0=否，1=是）
     */
    private Integer isCreated;

    private Long promotionActivityId;

    public Long getPromotionActivityId() {
        return promotionActivityId;
    }

    public void setPromotionActivityId(Long promotionActivityId) {
        this.promotionActivityId = promotionActivityId;
    }


    public Integer getResponsibilityType() {
        return responsibilityType;
    }

    public void setResponsibilityType(Integer responsibilityType) {
        this.responsibilityType = responsibilityType;
    }

    public Integer getPromotionDriverId() {
        return promotionDriverId;
    }

    public void setPromotionDriverId(Integer promotionDriverId) {
        this.promotionDriverId = promotionDriverId;
    }

    public BigDecimal getPromotionMoney() {
        return promotionMoney;
    }

    public void setPromotionMoney(BigDecimal promotionMoney) {
        this.promotionMoney = promotionMoney;
    }

    public Integer getAbnormal() {
        return abnormal;
    }

    public void setAbnormal(Integer abnormal) {
        this.abnormal = abnormal;
    }

    public String getAbnormalIntro() {
        return abnormalIntro;
    }

    public void setAbnormalIntro(String abnormalIntro) {
        this.abnormalIntro = abnormalIntro;
    }

    public String getAbnormalImg() {
        return abnormalImg;
    }

    public void setAbnormalImg(String abnormalImg) {
        this.abnormalImg = abnormalImg;
    }

    public Integer getId() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public Integer getType() {
        return type;
    }

    public void setType(Integer type) {
        this.type = type;
    }

    public Integer getCrossCityOrderId() {
        return crossCityOrderId;
    }

    public void setCrossCityOrderId(Integer crossCityOrderId) {
        this.crossCityOrderId = crossCityOrderId;
    }

    public Integer getPlace() {
        return place;
    }

    public void setPlace(Integer place) {
        this.place = place;
    }

    public Integer getUserId() {
        return userId;
    }

    public void setUserId(Integer userId) {
        this.userId = userId;
    }

    public Integer getDriverId() {
        return driverId;
    }

    public void setDriverId(Integer driverId) {
        this.driverId = driverId;
    }

    public Integer getCarId() {
        return carId;
    }

    public void setCarId(Integer carId) {
        this.carId = carId;
    }

    public String getOrderNum() {
        return orderNum;
    }

    public void setOrderNum(String orderNum) {
        this.orderNum = orderNum;
    }

    public Double getPlacementLon() {
        return placementLon;
    }

    public void setPlacementLon(Double placementLon) {
        this.placementLon = placementLon;
    }

    public Double getPlacementLat() {
        return placementLat;
    }

    public void setPlacementLat(Double placementLat) {
        this.placementLat = placementLat;
    }

    public String getPlacementAddress() {
        return placementAddress;
    }

    public void setPlacementAddress(String placementAddress) {
        this.placementAddress = placementAddress;
    }

    public Double getStartLon() {
        return startLon;
    }

    public void setStartLon(Double startLon) {
        this.startLon = startLon;
    }

    public Double getStartLat() {
        return startLat;
    }

    public void setStartLat(Double startLat) {
        this.startLat = startLat;
    }

    public String getStartAddress() {
        return startAddress;
    }

    public void setStartAddress(String startAddress) {
        this.startAddress = startAddress;
    }

    public Double getEndLon() {
        return endLon;
    }

    public void setEndLon(Double endLon) {
        this.endLon = endLon;
    }

    public Double getEndLat() {
        return endLat;
    }

    public void setEndLat(Double endLat) {
        this.endLat = endLat;
    }

    public String getEndAddress() {
        return endAddress;
    }

    public void setEndAddress(String endAddress) {
        this.endAddress = endAddress;
    }

    public Double getBoardingLon() {
        return boardingLon;
    }

    public void setBoardingLon(Double boardingLon) {
        this.boardingLon = boardingLon;
    }

    public Double getBoardingLat() {
        return boardingLat;
    }

    public void setBoardingLat(Double boardingLat) {
        this.boardingLat = boardingLat;
    }

    public String getBoardingAddress() {
        return boardingAddress;
    }

    public void setBoardingAddress(String boardingAddress) {
        this.boardingAddress = boardingAddress;
    }

    public Date getBoardingTime() {
        return boardingTime;
    }

    public void setBoardingTime(Date boardingTime) {
        this.boardingTime = boardingTime;
    }

    public Double getGetoffLon() {
        return getoffLon;
    }

    public void setGetoffLon(Double getoffLon) {
        this.getoffLon = getoffLon;
    }

    public Double getGetoffLat() {
        return getoffLat;
    }

    public void setGetoffLat(Double getoffLat) {
        this.getoffLat = getoffLat;
    }

    public String getGetoffAddress() {
        return getoffAddress;
    }

    public void setGetoffAddress(String getoffAddress) {
        this.getoffAddress = getoffAddress;
    }

    public Date getGetoffTime() {
        return getoffTime;
    }

    public void setGetoffTime(Date getoffTime) {
        this.getoffTime = getoffTime;
    }

    public Double getMileage() {
        return mileage;
    }

    public void setMileage(Double mileage) {
        this.mileage = mileage;
    }

    public Integer getPayType() {
        return payType;
    }

    public void setPayType(Integer payType) {
        this.payType = payType;
    }

    public Double getOrderMoney() {
        return orderMoney;
    }

    public void setOrderMoney(Double orderMoney) {
        this.orderMoney = orderMoney;
    }

    public Double getTravelMoney() {
        return travelMoney;
    }

    public void setTravelMoney(Double travelMoney) {
        this.travelMoney = travelMoney;
    }

    public Double getParkMoney() {
        return parkMoney;
    }

    public void setParkMoney(Double parkMoney) {
        this.parkMoney = parkMoney;
    }

    public Double getRoadTollMoney() {
        return roadTollMoney;
    }

    public void setRoadTollMoney(Double roadTollMoney) {
        this.roadTollMoney = roadTollMoney;
    }

    public Double getTipMoney() {
        return tipMoney;
    }

    public void setTipMoney(Double tipMoney) {
        this.tipMoney = tipMoney;
    }

    public Double getHolidayFee() {
        return holidayFee;
    }

    public void setHolidayFee(Double holidayFee) {
        this.holidayFee = holidayFee;
    }

    public Double getRedPacketMoney() {
        return redPacketMoney;
    }

    public void setRedPacketMoney(Double redPacketMoney) {
        this.redPacketMoney = redPacketMoney;
    }

    public Double getCouponMoney() {
        return couponMoney;
    }

    public void setCouponMoney(Double couponMoney) {
        this.couponMoney = couponMoney;
    }

    public Integer getRedPacketId() {
        return redPacketId;
    }

    public void setRedPacketId(Integer redPacketId) {
        this.redPacketId = redPacketId;
    }

    public Integer getCouponId() {
        return couponId;
    }

    public void setCouponId(Integer couponId) {
        this.couponId = couponId;
    }

    public Integer getTaxiCardId() {
        return taxiCardId;
    }

    public void setTaxiCardId(Integer taxiCardId) {
        this.taxiCardId = taxiCardId;
    }

    public Integer getUserTaxiCardId() {
        return userTaxiCardId;
    }

    public void setUserTaxiCardId(Integer userTaxiCardId) {
        this.userTaxiCardId = userTaxiCardId;
    }

    public Double getDiscountAmount() {
        return discountAmount;
    }

    public void setDiscountAmount(Double discountAmount) {
        this.discountAmount = discountAmount;
    }

    public Integer getCompanyId() {
        return companyId;
    }

    public void setCompanyId(Integer companyId) {
        this.companyId = companyId;
    }

    public Double getPayMoney() {
        return payMoney;
    }

    public void setPayMoney(Double payMoney) {
        this.payMoney = payMoney;
    }

    public Double getThankYouFee() {
        return thankYouFee;
    }

    public void setThankYouFee(Double thankYouFee) {
        this.thankYouFee = thankYouFee;
    }

    public Integer getSubstitute() {
        return substitute;
    }

    public void setSubstitute(Integer substitute) {
        this.substitute = substitute;
    }

    public String getPassengers() {
        return passengers;
    }

    public void setPassengers(String passengers) {
        this.passengers = passengers;
    }

    public String getPassengersPhone() {
        return passengersPhone;
    }

    public void setPassengersPhone(String passengersPhone) {
        this.passengersPhone = passengersPhone;
    }

    public Integer getState() {
        return state;
    }

    public void setState(Integer state) {
        this.state = state;
    }

    public Date getInsertTime() {
        return insertTime;
    }

    public void setInsertTime(Date insertTime) {
        this.insertTime = insertTime;
    }

    public Date getTravelTime() {
        return travelTime;
    }

    public void setTravelTime(Date travelTime) {
        this.travelTime = travelTime;
    }

    public Date getSnatchOrderTime() {
        return snatchOrderTime;
    }

    public void setSnatchOrderTime(Date snatchOrderTime) {
        this.snatchOrderTime = snatchOrderTime;
    }

    public Date getSetOutTime() {
        return setOutTime;
    }

    public void setSetOutTime(Date setOutTime) {
        this.setOutTime = setOutTime;
    }

    public Date getArriveTime() {
        return arriveTime;
    }

    public void setArriveTime(Date arriveTime) {
        this.arriveTime = arriveTime;
    }

    public Date getStartServiceTime() {
        return startServiceTime;
    }

    public void setStartServiceTime(Date startServiceTime) {
        this.startServiceTime = startServiceTime;
    }

    public Date getEndServiceTime() {
        return endServiceTime;
    }

    public void setEndServiceTime(Date endServiceTime) {
        this.endServiceTime = endServiceTime;
    }

    public Integer getOrderType() {
        return orderType;
    }

    public void setOrderType(Integer orderType) {
        this.orderType = orderType;
    }

    public Integer getOrderSource() {
        return orderSource;
    }

    public void setOrderSource(Integer orderSource) {
        this.orderSource = orderSource;
    }


    public Integer getInvoiceId() {
        return invoiceId;
    }

    public void setInvoiceId(Integer invoiceId) {
        this.invoiceId = invoiceId;
    }

    public Integer getPayManner() {
        return payManner;
    }

    public void setPayManner(Integer payManner) {
        this.payManner = payManner;
    }

    public Integer getIsReassign() {
        return isReassign;
    }

    public void setIsReassign(Integer isReassign) {
        this.isReassign = isReassign;
    }

    public Integer getReassignNotice() {
        return reassignNotice;
    }

    public void setReassignNotice(Integer reassignNotice) {
        this.reassignNotice = reassignNotice;
    }

    public String getTrackId() {
        return trackId;
    }

    public void setTrackId(String trackId) {
        this.trackId = trackId;
    }

    public Double getDiscount() {
        return discount;
    }

    public void setDiscount(Double discount) {
        this.discount = discount;
    }

    public Double getDiscountMoney() {
        return discountMoney;
    }

    public void setDiscountMoney(Double discountMoney) {
        this.discountMoney = discountMoney;
    }

    public Integer getActivityId() {
        return activityId;
    }

    public void setActivityId(Integer activityId) {
        this.activityId = activityId;
    }

    public Integer getIsDelete() {
        return isDelete;
    }

    public void setIsDelete(Integer isDelete) {
        this.isDelete = isDelete;
    }

    public Integer getOldState() {
        return oldState;
    }

    public void setOldState(Integer oldState) {
        this.oldState = oldState;
    }

    public String getTelX() {
        return telX;
    }

    public void setTelX(String telX) {
        this.telX = telX;
    }

    public String getBindId() {
        return bindId;
    }

    public void setBindId(String bindId) {
        this.bindId = bindId;
    }

    public String getSplitAllocation() {
        return splitAllocation;
    }

    public void setSplitAllocation(String splitAllocation) {
        this.splitAllocation = splitAllocation;
    }
    
    public Integer getPromotion() {
        return promotion;
    }
    
    public void setPromotion(Integer promotion) {
        this.promotion = promotion;
    }
    
    public String getVoice() {
        return voice;
    }
    
    public void setVoice(String voice) {
        this.voice = voice;
    }
    
    public Date getVoiceTime() {
        return voiceTime;
    }
    
    public void setVoiceTime(Date voiceTime) {
        this.voiceTime = voiceTime;
    }
    
    public String getPromotionUser() {
        return promotionUser;
    }
    
    public void setPromotionUser(String promotionUser) {
        this.promotionUser = promotionUser;
    }
    
    public String getPromotionPhone() {
        return promotionPhone;
    }
    
    public void setPromotionPhone(String promotionPhone) {
        this.promotionPhone = promotionPhone;
    }
    
    public String getTravelId() {
        return travelId;
    }
    
    public void setTravelId(String travelId) {
        this.travelId = travelId;
    }
    
    public Integer getIsCreated() {
        return isCreated;
    }
    
    public void setIsCreated(Integer isCreated) {
        this.isCreated = isCreated;
    }
    
    @Override
    public String toString() {
        return "OrderTaxi{" +
                "id=" + id +
                ", type=" + type +
                ", crossCityOrderId=" + crossCityOrderId +
                ", place=" + place +
                ", userId=" + userId +
                ", driverId=" + driverId +
                ", carId=" + carId +
                ", orderNum='" + orderNum + '\'' +
                ", placementLon=" + placementLon +
                ", placementLat=" + placementLat +
                ", placementAddress='" + placementAddress + '\'' +
                ", startLon=" + startLon +
                ", startLat=" + startLat +
                ", startAddress='" + startAddress + '\'' +
                ", endLon=" + endLon +
                ", endLat=" + endLat +
                ", endAddress='" + endAddress + '\'' +
                ", boardingLon=" + boardingLon +
                ", boardingLat=" + boardingLat +
                ", boardingAddress='" + boardingAddress + '\'' +
                ", boardingTime=" + boardingTime +
                ", getoffLon=" + getoffLon +
                ", getoffLat=" + getoffLat +
                ", getoffAddress='" + getoffAddress + '\'' +
                ", getoffTime=" + getoffTime +
                ", mileage=" + mileage +
                ", payManner=" + payManner +
                ", payType=" + payType +
                ", orderMoney=" + orderMoney +
                ", travelMoney=" + travelMoney +
                ", parkMoney=" + parkMoney +
                ", roadTollMoney=" + roadTollMoney +
                ", tipMoney=" + tipMoney +
                ", redPacketMoney=" + redPacketMoney +
                ", couponMoney=" + couponMoney +
                ", redPacketId=" + redPacketId +
                ", couponId=" + couponId +
                ", discount=" + discount +
                ", discountMoney=" + discountMoney +
                ", activityId=" + activityId +
                ", companyId=" + companyId +
                ", payMoney=" + payMoney +
                ", substitute=" + substitute +
                ", passengers='" + passengers + '\'' +
                ", passengersPhone='" + passengersPhone + '\'' +
                ", state=" + state +
                ", insertTime=" + insertTime +
                ", travelTime=" + travelTime +
                ", snatchOrderTime=" + snatchOrderTime +
                ", setOutTime=" + setOutTime +
                ", arriveTime=" + arriveTime +
                ", startServiceTime=" + startServiceTime +
                ", endServiceTime=" + endServiceTime +
                ", orderType=" + orderType +
                ", orderSource=" + orderSource +
                ", invoiceId=" + invoiceId +
                ", isReassign=" + isReassign +
                ", reassignNotice=" + reassignNotice +
                ", trackId='" + trackId + '\'' +
                ", isDelete=" + isDelete +
                ", oldState=" + oldState +
                ", telX='" + telX + '\'' +
                ", bindId='" + bindId + '\'' +
                '}';
    }
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    @TableField("id")
    private Integer id;
    /**
     * 订单类型（1=普通订单，2=摆渡订单）
     */
    @TableField("type")
    private Integer type;
    /**
     * 跨城订单id(摆渡车专用)
     */
    @TableField("crossCityOrderId")
    private Integer crossCityOrderId;
    /**
     * 摆渡方位（1=跨城起点，2=跨城终点）
     */
    @TableField("place")
    private Integer place;
    /**
     * 用户id
     */
    @TableField("userId")
    private Integer userId;
    /**
     * 司机id
     */
    @TableField("driverId")
    private Integer driverId;
    /**
     * 车辆id
     */
    @TableField("carId")
    private Integer carId;
    /**
     * 订单号
     */
    @TableField("orderNum")
    private String orderNum;
    /**
     * 下单地点经度
     */
    @TableField("placementLon")
    private Double placementLon;
    /**
     * 下单地点纬度
     */
    @TableField("placementLat")
    private Double placementLat;
    /**
     * 下单地点
     */
    @TableField("placementAddress")
    private String placementAddress;
    /**
     * 起点经度
     */
    @TableField("startLon")
    private Double startLon;
    /**
     * 起点纬度
     */
    @TableField("startLat")
    private Double startLat;
    /**
     * 起点
     */
    @TableField("startAddress")
    private String startAddress;
    /**
     * 目的地经度
     */
    @TableField("endLon")
    private Double endLon;
    /**
     * 目的地纬度
     */
    @TableField("endLat")
    private Double endLat;
    /**
     * 目的地
     */
    @TableField("endAddress")
    private String endAddress;
    /**
     * 上车点经度
     */
    @TableField("boardingLon")
    private Double boardingLon;
    /**
     * 上车点纬度
     */
    @TableField("boardingLat")
    private Double boardingLat;
    /**
     * 上车地点
     */
    @TableField("boardingAddress")
    private String boardingAddress;
    /**
     * 上车时间
     */
    @TableField("boardingTime")
    private Date boardingTime;
    /**
     * 下车点经度
     */
    @TableField("getoffLon")
    private Double getoffLon;
    /**
     * 下车点纬度
     */
    @TableField("getoffLat")
    private Double getoffLat;
    /**
     * 下车点
     */
    @TableField("getoffAddress")
    private String getoffAddress;
    /**
     * 下车时间
     */
    @TableField("getoffTime")
    private Date getoffTime;
    /**
     * 行驶里程数（米）
     */
    @TableField("mileage")
    private Double mileage;
    /**
     * 支付方式（1=OK平台支付，2=其他方式支付）
     */
    @TableField("payManner")
    private Integer payManner;
    /**
     * 支付方式（1=微信，2=支付宝，3=余额）
     */
    @TableField("payType")
    private Integer payType;
    /**
     * 订单金额
     */
    @TableField("orderMoney")
    private Double orderMoney;
    /**
     * 行程费
     */
    @TableField("travelMoney")
    private Double travelMoney;
    /**
     * 停车费
     */
    @TableField("parkMoney")
    private Double parkMoney;
    /**
     * 过路费
     */
    @TableField("roadTollMoney")
    private Double roadTollMoney;
    /**
     * 小费
     */
    @TableField("tipMoney")
    private Double tipMoney;
    //节假费
    @TableField("holidayFee")
    private Double holidayFee;
    /**
     * 红包抵扣金额
     */
    @TableField("redPacketMoney")
    private Double redPacketMoney;
    /**
     * 优惠券抵扣金额
     */
    @TableField("couponMoney")
    private Double couponMoney;
    /**
     * 红包id
     */
    @TableField("redPacketId")
    private Integer redPacketId;
    /**
     * 优惠券id
     */
    @TableField("couponId")
    private Integer couponId;
    /**
     * 折扣
     */
    @TableField("discount")
    private Double discount;
    /**
     * 折扣优惠金额
     */
    @TableField("discountMoney")
    private Double discountMoney;
    /**
     * 折扣活动id
     */
    @TableField("activityId")
    private Integer activityId;
    /**
     * 打折卡id
     */
    @TableField("taxiCardId")
    private Integer taxiCardId;
    /**
     * 打车卡记录id
     */
    @TableField("userTaxiCardId")
    private Integer userTaxiCardId;
    /**
     * 优惠金额
     */
    @TableField("discountAmount")
    private Double discountAmount;
    /**
     * 公司id
     */
    @TableField("companyId")
    private Integer companyId;
    /**
     * 支付金额
     */
    @TableField("payMoney")
    private Double payMoney;
    //感谢费
    @TableField("thankYouFee")
    private Double thankYouFee;
    /**
     * 是否是代下单（0：否，1：是）
     */
    @TableField("substitute")
    private Integer substitute;
    /**
     * 乘车人姓名
     */
    @TableField("passengers")
    private String passengers;
    /**
     * 乘车人电话
     */
    @TableField("passengersPhone")
    private String passengersPhone;
    /**
     * 订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付）
     */
    @TableField("state")
    private Integer state;
    /**
     * 下单时间
     */
    @TableField("insertTime")
    private Date insertTime;
    /**
     * 出行时间
     */
    @TableField("travelTime")
    private Date travelTime;
    /**
     * 抢单时间
     */
    @TableField("snatchOrderTime")
    private Date snatchOrderTime;
    /**
     * 司机点出发时间
     */
    @TableField("setOutTime")
    private Date setOutTime;
    /**
     * 司机到达预约地点时间
     */
    @TableField("arriveTime")
    private Date arriveTime;
    /**
     * 开始服务时间
     */
    @TableField("startServiceTime")
    private Date startServiceTime;
    /**
     * 结束服务时间
     */
    @TableField("endServiceTime")
    private Date endServiceTime;
    /**
     * 订单类型（1=普通，2=预约）
     */
    @TableField("orderType")
    private Integer orderType;
    /**
     * 订单来源(1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单，6：道行龙城下单)
     */
    @TableField("orderSource")
    private Integer orderSource;
    /**
     * 发票id
     */
    @TableField("invoiceId")
    private Integer invoiceId;
    /**
     * 是否是改派单（1=否，=是）
     *
     * @return
     */
    @TableField("isReassign")
    private Integer isReassign;
    /**
     * 改派通知标识（0=没有改派，1=改派中，2=已改派）用于通知前端获取新司机数据
     */
    @TableField("reassignNotice")
    private Integer reassignNotice;
    /**
     * 高德猎鹰轨迹id
     *
     * @return
     */
    @TableField("trackId")
    private String trackId;
    /**
     * 是否删除（1=否，2=是）
     */
    @TableField("isDelete")
    private Integer isDelete;
    /**
     * 该派前的订单状态
     *
     * @return
     */
    @TableField("oldState")
    private Integer oldState;
    /**
     * 移动小号
     *
     * @return
     */
    @TableField("telX")
    private String telX;
    /**
     * 绑定小号关系id
     *
     * @return
     */
    @TableField("bindId")
    private String bindId;
	
    /**
     * 是否异常订单 1否 2是
     */
    @TableField("abnormal")
    private Integer abnormal;
	
	
    /**
     * 乘客反馈情况
     */
    @TableField("abnormalIntro")
    private String abnormalIntro;
	
    /**
     * 乘客反馈图片
     */
    @TableField("abnormalImg")
    private String abnormalImg;
	
	
    private Integer promotionDriverId;
	
    private BigDecimal promotionMoney;
	
	
    private String splitAllocation;
	
    private Integer responsibilityType;
	
	
    private Integer promotion;
	
    private String voice;
	
	
    private Date voiceTime;
	
    private String promotionUser;
	
    private String promotionPhone;
	
    private Long promotionActivityId;
    /**
     * 中台行程id
     */
    private String travelId;
    /**
     * 中台是否已创建订单（0=否，1=是）
     */
    private Integer isCreated;
    /**
     * 是否是追缴单（0=否，1=是）
     */
    private Integer recoveryOrder;
	
    public Long getPromotionActivityId() {
        return promotionActivityId;
    }
	
    public void setPromotionActivityId(Long promotionActivityId) {
        this.promotionActivityId = promotionActivityId;
    }
	
	
    public Integer getResponsibilityType() {
        return responsibilityType;
    }
	
    public void setResponsibilityType(Integer responsibilityType) {
        this.responsibilityType = responsibilityType;
    }
	
    public Integer getPromotionDriverId() {
        return promotionDriverId;
    }
	
    public void setPromotionDriverId(Integer promotionDriverId) {
        this.promotionDriverId = promotionDriverId;
    }
	
    public BigDecimal getPromotionMoney() {
        return promotionMoney;
    }
	
    public void setPromotionMoney(BigDecimal promotionMoney) {
        this.promotionMoney = promotionMoney;
    }
	
    public Integer getAbnormal() {
        return abnormal;
    }
	
    public void setAbnormal(Integer abnormal) {
        this.abnormal = abnormal;
    }
	
    public String getAbnormalIntro() {
        return abnormalIntro;
    }
	
    public void setAbnormalIntro(String abnormalIntro) {
        this.abnormalIntro = abnormalIntro;
    }
	
    public String getAbnormalImg() {
        return abnormalImg;
    }
	
    public void setAbnormalImg(String abnormalImg) {
        this.abnormalImg = abnormalImg;
    }
	
    public Integer getId() {
        return id;
    }
	
    public void setId(Integer id) {
        this.id = id;
    }
	
    public Integer getType() {
        return type;
    }
	
    public void setType(Integer type) {
        this.type = type;
    }
	
    public Integer getCrossCityOrderId() {
        return crossCityOrderId;
    }
	
    public void setCrossCityOrderId(Integer crossCityOrderId) {
        this.crossCityOrderId = crossCityOrderId;
    }
	
    public Integer getPlace() {
        return place;
    }
	
    public void setPlace(Integer place) {
        this.place = place;
    }
	
    public Integer getUserId() {
        return userId;
    }
	
    public void setUserId(Integer userId) {
        this.userId = userId;
    }
	
    public Integer getDriverId() {
        return driverId;
    }
	
    public void setDriverId(Integer driverId) {
        this.driverId = driverId;
    }
	
    public Integer getCarId() {
        return carId;
    }
	
    public void setCarId(Integer carId) {
        this.carId = carId;
    }
	
    public String getOrderNum() {
        return orderNum;
    }
	
    public void setOrderNum(String orderNum) {
        this.orderNum = orderNum;
    }
	
    public Double getPlacementLon() {
        return placementLon;
    }
	
    public void setPlacementLon(Double placementLon) {
        this.placementLon = placementLon;
    }
	
    public Double getPlacementLat() {
        return placementLat;
    }
	
    public void setPlacementLat(Double placementLat) {
        this.placementLat = placementLat;
    }
	
    public String getPlacementAddress() {
        return placementAddress;
    }
	
    public void setPlacementAddress(String placementAddress) {
        this.placementAddress = placementAddress;
    }
	
    public Double getStartLon() {
        return startLon;
    }
	
    public void setStartLon(Double startLon) {
        this.startLon = startLon;
    }
	
    public Double getStartLat() {
        return startLat;
    }
	
    public void setStartLat(Double startLat) {
        this.startLat = startLat;
    }
	
    public String getStartAddress() {
        return startAddress;
    }
	
    public void setStartAddress(String startAddress) {
        this.startAddress = startAddress;
    }
	
    public Double getEndLon() {
        return endLon;
    }
	
    public void setEndLon(Double endLon) {
        this.endLon = endLon;
    }
	
    public Double getEndLat() {
        return endLat;
    }
	
    public void setEndLat(Double endLat) {
        this.endLat = endLat;
    }
	
    public String getEndAddress() {
        return endAddress;
    }
	
    public void setEndAddress(String endAddress) {
        this.endAddress = endAddress;
    }
	
    public Double getBoardingLon() {
        return boardingLon;
    }
	
    public void setBoardingLon(Double boardingLon) {
        this.boardingLon = boardingLon;
    }
	
    public Double getBoardingLat() {
        return boardingLat;
    }
	
    public void setBoardingLat(Double boardingLat) {
        this.boardingLat = boardingLat;
    }
	
    public String getBoardingAddress() {
        return boardingAddress;
    }
	
    public void setBoardingAddress(String boardingAddress) {
        this.boardingAddress = boardingAddress;
    }
	
    public Date getBoardingTime() {
        return boardingTime;
    }
	
    public void setBoardingTime(Date boardingTime) {
        this.boardingTime = boardingTime;
    }
	
    public Double getGetoffLon() {
        return getoffLon;
    }
	
    public void setGetoffLon(Double getoffLon) {
        this.getoffLon = getoffLon;
    }
	
    public Double getGetoffLat() {
        return getoffLat;
    }
	
    public void setGetoffLat(Double getoffLat) {
        this.getoffLat = getoffLat;
    }
	
    public String getGetoffAddress() {
        return getoffAddress;
    }
	
    public void setGetoffAddress(String getoffAddress) {
        this.getoffAddress = getoffAddress;
    }
	
    public Date getGetoffTime() {
        return getoffTime;
    }
	
    public void setGetoffTime(Date getoffTime) {
        this.getoffTime = getoffTime;
    }
	
    public Double getMileage() {
        return mileage;
    }
	
    public void setMileage(Double mileage) {
        this.mileage = mileage;
    }
	
    public Integer getPayType() {
        return payType;
    }
	
    public void setPayType(Integer payType) {
        this.payType = payType;
    }
	
    public Double getOrderMoney() {
        return orderMoney;
    }
	
    public void setOrderMoney(Double orderMoney) {
        this.orderMoney = orderMoney;
    }
	
    public Double getTravelMoney() {
        return travelMoney;
    }
	
    public void setTravelMoney(Double travelMoney) {
        this.travelMoney = travelMoney;
    }
	
    public Double getParkMoney() {
        return parkMoney;
    }
	
    public void setParkMoney(Double parkMoney) {
        this.parkMoney = parkMoney;
    }
	
    public Double getRoadTollMoney() {
        return roadTollMoney;
    }
	
    public void setRoadTollMoney(Double roadTollMoney) {
        this.roadTollMoney = roadTollMoney;
    }
	
    public Double getTipMoney() {
        return tipMoney;
    }
	
    public void setTipMoney(Double tipMoney) {
        this.tipMoney = tipMoney;
    }
	
    public Double getHolidayFee() {
        return holidayFee;
    }
	
    public void setHolidayFee(Double holidayFee) {
        this.holidayFee = holidayFee;
    }
	
    public Double getRedPacketMoney() {
        return redPacketMoney;
    }
	
    public void setRedPacketMoney(Double redPacketMoney) {
        this.redPacketMoney = redPacketMoney;
    }
	
    public Double getCouponMoney() {
        return couponMoney;
    }
	
    public void setCouponMoney(Double couponMoney) {
        this.couponMoney = couponMoney;
    }
	
    public Integer getRedPacketId() {
        return redPacketId;
    }
	
    public void setRedPacketId(Integer redPacketId) {
        this.redPacketId = redPacketId;
    }
	
    public Integer getCouponId() {
        return couponId;
    }
	
    public void setCouponId(Integer couponId) {
        this.couponId = couponId;
    }
	
    public Integer getTaxiCardId() {
        return taxiCardId;
    }
	
    public void setTaxiCardId(Integer taxiCardId) {
        this.taxiCardId = taxiCardId;
    }
	
    public Integer getUserTaxiCardId() {
        return userTaxiCardId;
    }
	
    public void setUserTaxiCardId(Integer userTaxiCardId) {
        this.userTaxiCardId = userTaxiCardId;
    }
	
    public Double getDiscountAmount() {
        return discountAmount;
    }
	
    public void setDiscountAmount(Double discountAmount) {
        this.discountAmount = discountAmount;
    }
	
    public Integer getCompanyId() {
        return companyId;
    }
	
    public void setCompanyId(Integer companyId) {
        this.companyId = companyId;
    }
	
    public Double getPayMoney() {
        return payMoney;
    }
	
    public void setPayMoney(Double payMoney) {
        this.payMoney = payMoney;
    }
	
    public Double getThankYouFee() {
        return thankYouFee;
    }
	
    public void setThankYouFee(Double thankYouFee) {
        this.thankYouFee = thankYouFee;
    }
	
    public Integer getSubstitute() {
        return substitute;
    }
	
    public void setSubstitute(Integer substitute) {
        this.substitute = substitute;
    }
	
    public String getPassengers() {
        return passengers;
    }
	
    public void setPassengers(String passengers) {
        this.passengers = passengers;
    }
	
    public String getPassengersPhone() {
        return passengersPhone;
    }
	
    public void setPassengersPhone(String passengersPhone) {
        this.passengersPhone = passengersPhone;
    }
	
    public Integer getState() {
        return state;
    }
	
    public void setState(Integer state) {
        this.state = state;
    }
	
    public Date getInsertTime() {
        return insertTime;
    }
	
    public void setInsertTime(Date insertTime) {
        this.insertTime = insertTime;
    }
	
    public Date getTravelTime() {
        return travelTime;
    }
	
    public void setTravelTime(Date travelTime) {
        this.travelTime = travelTime;
    }
	
    public Date getSnatchOrderTime() {
        return snatchOrderTime;
    }
	
    public void setSnatchOrderTime(Date snatchOrderTime) {
        this.snatchOrderTime = snatchOrderTime;
    }
	
    public Date getSetOutTime() {
        return setOutTime;
    }
	
    public void setSetOutTime(Date setOutTime) {
        this.setOutTime = setOutTime;
    }
	
    public Date getArriveTime() {
        return arriveTime;
    }
	
    public void setArriveTime(Date arriveTime) {
        this.arriveTime = arriveTime;
    }
	
    public Date getStartServiceTime() {
        return startServiceTime;
    }
	
    public void setStartServiceTime(Date startServiceTime) {
        this.startServiceTime = startServiceTime;
    }
	
    public Date getEndServiceTime() {
        return endServiceTime;
    }
	
    public void setEndServiceTime(Date endServiceTime) {
        this.endServiceTime = endServiceTime;
    }
	
    public Integer getOrderType() {
        return orderType;
    }
	
    public void setOrderType(Integer orderType) {
        this.orderType = orderType;
    }
	
    public Integer getOrderSource() {
        return orderSource;
    }
	
    public void setOrderSource(Integer orderSource) {
        this.orderSource = orderSource;
    }
	
	
    public Integer getInvoiceId() {
        return invoiceId;
    }
	
    public void setInvoiceId(Integer invoiceId) {
        this.invoiceId = invoiceId;
    }
	
    public Integer getPayManner() {
        return payManner;
    }
	
    public void setPayManner(Integer payManner) {
        this.payManner = payManner;
    }
	
    public Integer getIsReassign() {
        return isReassign;
    }
	
    public void setIsReassign(Integer isReassign) {
        this.isReassign = isReassign;
    }
	
    public Integer getReassignNotice() {
        return reassignNotice;
    }
	
    public void setReassignNotice(Integer reassignNotice) {
        this.reassignNotice = reassignNotice;
    }
	
    public String getTrackId() {
        return trackId;
    }
	
    public void setTrackId(String trackId) {
        this.trackId = trackId;
    }
	
    public Double getDiscount() {
        return discount;
    }
	
    public void setDiscount(Double discount) {
        this.discount = discount;
    }
	
    public Double getDiscountMoney() {
        return discountMoney;
    }
	
    public void setDiscountMoney(Double discountMoney) {
        this.discountMoney = discountMoney;
    }
	
    public Integer getActivityId() {
        return activityId;
    }
	
    public void setActivityId(Integer activityId) {
        this.activityId = activityId;
    }
	
    public Integer getIsDelete() {
        return isDelete;
    }
	
    public void setIsDelete(Integer isDelete) {
        this.isDelete = isDelete;
    }
	
    public Integer getOldState() {
        return oldState;
    }
	
    public void setOldState(Integer oldState) {
        this.oldState = oldState;
    }
	
    public String getTelX() {
        return telX;
    }
	
    public void setTelX(String telX) {
        this.telX = telX;
    }
	
    public String getBindId() {
        return bindId;
    }
	
    public void setBindId(String bindId) {
        this.bindId = bindId;
    }
	
    public String getSplitAllocation() {
        return splitAllocation;
    }
	
    public void setSplitAllocation(String splitAllocation) {
        this.splitAllocation = splitAllocation;
    }
	
    public Integer getPromotion() {
        return promotion;
    }
	
    public void setPromotion(Integer promotion) {
        this.promotion = promotion;
    }
	
    public String getVoice() {
        return voice;
    }
	
    public void setVoice(String voice) {
        this.voice = voice;
    }
	
    public Date getVoiceTime() {
        return voiceTime;
    }
	
    public void setVoiceTime(Date voiceTime) {
        this.voiceTime = voiceTime;
    }
	
    public String getPromotionUser() {
        return promotionUser;
    }
	
    public void setPromotionUser(String promotionUser) {
        this.promotionUser = promotionUser;
    }
	
    public String getPromotionPhone() {
        return promotionPhone;
    }
	
    public void setPromotionPhone(String promotionPhone) {
        this.promotionPhone = promotionPhone;
    }
	
    public String getTravelId() {
        return travelId;
    }
	
    public void setTravelId(String travelId) {
        this.travelId = travelId;
    }
	
    public Integer getIsCreated() {
        return isCreated;
    }
	
    public void setIsCreated(Integer isCreated) {
        this.isCreated = isCreated;
    }
	
    public Integer getRecoveryOrder() {
        return recoveryOrder;
    }
	
    public void setRecoveryOrder(Integer recoveryOrder) {
        this.recoveryOrder = recoveryOrder;
    }
	
    @Override
    public String toString() {
        return "OrderTaxi{" +
                "id=" + id +
                ", type=" + type +
                ", crossCityOrderId=" + crossCityOrderId +
                ", place=" + place +
                ", userId=" + userId +
                ", driverId=" + driverId +
                ", carId=" + carId +
                ", orderNum='" + orderNum + '\'' +
                ", placementLon=" + placementLon +
                ", placementLat=" + placementLat +
                ", placementAddress='" + placementAddress + '\'' +
                ", startLon=" + startLon +
                ", startLat=" + startLat +
                ", startAddress='" + startAddress + '\'' +
                ", endLon=" + endLon +
                ", endLat=" + endLat +
                ", endAddress='" + endAddress + '\'' +
                ", boardingLon=" + boardingLon +
                ", boardingLat=" + boardingLat +
                ", boardingAddress='" + boardingAddress + '\'' +
                ", boardingTime=" + boardingTime +
                ", getoffLon=" + getoffLon +
                ", getoffLat=" + getoffLat +
                ", getoffAddress='" + getoffAddress + '\'' +
                ", getoffTime=" + getoffTime +
                ", mileage=" + mileage +
                ", payManner=" + payManner +
                ", payType=" + payType +
                ", orderMoney=" + orderMoney +
                ", travelMoney=" + travelMoney +
                ", parkMoney=" + parkMoney +
                ", roadTollMoney=" + roadTollMoney +
                ", tipMoney=" + tipMoney +
                ", redPacketMoney=" + redPacketMoney +
                ", couponMoney=" + couponMoney +
                ", redPacketId=" + redPacketId +
                ", couponId=" + couponId +
                ", discount=" + discount +
                ", discountMoney=" + discountMoney +
                ", activityId=" + activityId +
                ", companyId=" + companyId +
                ", payMoney=" + payMoney +
                ", substitute=" + substitute +
                ", passengers='" + passengers + '\'' +
                ", passengersPhone='" + passengersPhone + '\'' +
                ", state=" + state +
                ", insertTime=" + insertTime +
                ", travelTime=" + travelTime +
                ", snatchOrderTime=" + snatchOrderTime +
                ", setOutTime=" + setOutTime +
                ", arriveTime=" + arriveTime +
                ", startServiceTime=" + startServiceTime +
                ", endServiceTime=" + endServiceTime +
                ", orderType=" + orderType +
                ", orderSource=" + orderSource +
                ", invoiceId=" + invoiceId +
                ", isReassign=" + isReassign +
                ", reassignNotice=" + reassignNotice +
                ", trackId='" + trackId + '\'' +
                ", isDelete=" + isDelete +
                ", oldState=" + oldState +
                ", telX='" + telX + '\'' +
                ", bindId='" + bindId + '\'' +
                '}';
    }
}

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IPaymentRecordService.java

@@ -12,7 +12,7 @@
     * 添加数据
     * @param orderId       订单id
     * @param orderType     订单类型
     * @param payType       支付方式（1=微信，2=支付宝）
     * @param payType       支付方式（1=微信，2=支付宝，3=备用金）
     * @param amount        支付金额
     * @param code          第三方支付单号
     * @param state         支付状态（1=待支付，2=已支付）