update

liujie

2026-04-27 ca3975b732ee0a5fc4d0ce41c1111d1b730b2e78

update

 DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java

@@ -503,6 +503,16 @@
    private String abnormalRemark;


    private Integer cancelType;

    public Integer getCancelType() {
        return cancelType;
    }

    public void setCancelType(Integer cancelType) {
        this.cancelType = cancelType;
    }

    public String getPromotionUser() {
        return promotionUser;
    }

 DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -546,6 +546,7 @@
                orderPrivateCar.setEndServiceTime(new Date());
                break;
        }
        orderPrivateCar.setCancelType(2);
        this.updateById(orderPrivateCar);

        // TODO: 2020/6/5 推送状态

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

@@ -361,6 +361,8 @@
    @TableField("bindId")
    private String bindId;



    private String splitAllocation;


@@ -383,6 +385,18 @@
    private String travelId;


    private Integer cancelType;

    public Integer getCancelType() {
        return cancelType;
    }

    public void setCancelType(Integer cancelType) {
        this.cancelType = cancelType;
    }



    public String getPromotionUser() {
        return promotionUser;
    }

 DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java

@@ -511,6 +511,7 @@
                systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderTaxi.getUserId(), 1);
                break;
        }
        orderTaxi.setCancelType(2);
        this.updateById(orderTaxi);
    
        // TODO: 2020/6/5 推送状态

 UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml

@@ -395,7 +395,8 @@
        IF((a.abnormalIntro is null and a.recoveryOrder = 1) or (a.state in (8, 9) and null = a.abnormal), 0, 1) as appealButton,
        a.paymentMode,
        a.estimateAmount,
        a.serverCarModel
        a.serverCarModel,
        a.cancelType
        from t_order_private_car a
        left join t_driver b on (a.driverId = b.id)
        left join t_car c on (a.carId = c.id)

 UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml

@@ -286,7 +286,7 @@
        a.headImgUrl as avatar,
        a.phone as phone,
        c.carLicensePlate as carCode,
        CONCAT(F.`name`, d.`name`,  '.', c.carColor) as carName,
        CONCAT(f.`name`, d.`name`,  '.', c.carColor) as carName,
        (select sum(fraction) / count(id) from t_order_evaluate where driverId = a.id) as score,
        (
        (select count(id) from t_order_private_car where state in (7, 8, 9) and driverId = a.id) +

 UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotations.TableField;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

@@ -206,6 +207,17 @@
    @TableField("estimateAmount")
    private Double estimateAmount;

    @ApiModelProperty("取消类型1可以取消 2不可取消")
    private Integer cancelType;


    public Integer getCancelType() {
        return cancelType;
    }

    public void setCancelType(Integer cancelType) {
        this.cancelType = cancelType;
    }

    public Double getEstimateAmount() {
        return estimateAmount;
@@ -417,6 +429,7 @@

    @ApiModelProperty("计费规则")
    private String chargeRules;


    public String getChargeRules() {
        return chargeRules;
@@ -1127,6 +1140,7 @@
            orderInfoWarpper.setPaymentMode(null != map.get("paymentMode") ? Integer.valueOf(map.get("paymentMode").toString()) : null);
            orderInfoWarpper.setPaymentMode(null != map.get("paymentMode") ? Integer.valueOf(map.get("paymentMode").toString()) : null);
            orderInfoWarpper.setOrderAdditionalFeeWarpper(list);
            orderInfoWarpper.setCancelType(null != map.get("cancelType") ? Integer.valueOf(map.get("cancelType").toString()) : 1);
        }
        return orderInfoWarpper;
    }

 UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml

@@ -271,7 +271,8 @@
        a.companyId,
        0 as appealButton,
        a.paymentMode,
        a.estimateAmount
        a.estimateAmount,
        a.cancelType
        from t_order_taxi a
        left join t_driver b on (a.driverId = b.id)
        left join t_car c on (a.carId = c.id)