新增加功能

Pu Zhibing

2024-12-15 0ac52fc4efed18fc2a85a4858abec7dabd55ffad

新增加功能

 DriverAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java

@@ -363,6 +363,26 @@
     * 上次人脸识别时间
     */
    private Date lastFacialTime;
    /**
     * 专车抽成方式（1=比例，2=固定金额）
     */
    private Integer specialCarCommissionType;
    /**
     * 专车抽成金额
     */
    private Double specialCarCommission;
    /**
     * 城际抽成方式（1=比例，2=固定金额）
     */
    private Integer intercityCommissionType;
    /**
     * 城际抽成金额
     */
    private Double intercityCommission;
    /**
     * 提现冻结金额
     */
    private Double withdrawFrozenAmount;

    @Override
    public Integer getId() {
@@ -885,7 +905,79 @@
    public void setWithdrawPassword(String withdrawPassword) {
        this.withdrawPassword = withdrawPassword;
    }

    
    public String getWechatPic() {
        return wechatPic;
    }
    
    public void setWechatPic(String wechatPic) {
        this.wechatPic = wechatPic;
    }
    
    public Integer getFailCount() {
        return failCount;
    }
    
    public void setFailCount(Integer failCount) {
        this.failCount = failCount;
    }
    
    public Integer getIsNeedFacial() {
        return isNeedFacial;
    }
    
    public void setIsNeedFacial(Integer isNeedFacial) {
        this.isNeedFacial = isNeedFacial;
    }
    
    public Date getLastFacialTime() {
        return lastFacialTime;
    }
    
    public void setLastFacialTime(Date lastFacialTime) {
        this.lastFacialTime = lastFacialTime;
    }
    
    public Integer getSpecialCarCommissionType() {
        return specialCarCommissionType;
    }
    
    public void setSpecialCarCommissionType(Integer specialCarCommissionType) {
        this.specialCarCommissionType = specialCarCommissionType;
    }
    
    public Double getSpecialCarCommission() {
        return specialCarCommission;
    }
    
    public void setSpecialCarCommission(Double specialCarCommission) {
        this.specialCarCommission = specialCarCommission;
    }
    
    public Integer getIntercityCommissionType() {
        return intercityCommissionType;
    }
    
    public void setIntercityCommissionType(Integer intercityCommissionType) {
        this.intercityCommissionType = intercityCommissionType;
    }
    
    public Double getIntercityCommission() {
        return intercityCommission;
    }
    
    public void setIntercityCommission(Double intercityCommission) {
        this.intercityCommission = intercityCommission;
    }
    
    public Double getWithdrawFrozenAmount() {
        return withdrawFrozenAmount;
    }
    
    public void setWithdrawFrozenAmount(Double withdrawFrozenAmount) {
        this.withdrawFrozenAmount = withdrawFrozenAmount;
    }
    
    @Override
    public String toString() {
        return "Driver{" +

 DriverAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java

@@ -76,7 +76,12 @@
        if(null == type){
            type = 1;
        }

        Double balance = driver.getBalance();
        Double withdrawFrozenAmount = driver.getWithdrawFrozenAmount();
        if(balance - money < withdrawFrozenAmount){
            return ResultUtil.error("提交失败！已超出当前提现冻结额度");
        }
    
        Withdrawal withdrawal = new Withdrawal();
        if(type == 1){
            if(null == driver.getLaveActivityMoney()){

 DriverAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java

@@ -70,7 +70,7 @@
        // 接收短信的手机号码
        request.putQueryParameter("PhoneNumbers", phone);
        // 短信签名名称。请在控制台签名管理页面签名名称一列查看（必须是已添加、并通过审核的短信签名）。
        request.putQueryParameter("SignName", "未来出行");
        request.putQueryParameter("SignName", "安合出行");
        // 短信模板ID
        request.putQueryParameter("TemplateCode", templateCode);
        // 短信模板变量对应的实际值，JSON格式。

 DriverAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/HuaWeiSMSUtil.java

@@ -45,7 +45,7 @@

        //条件必填,国内短信关注,当templateId指定的模板类型为通用模板时生效且必填,必须是已审核通过的,与模板类型一致的签名名称
        //国际/港澳台短信不用关注该参数
        String signature = "未来出行"; //签名名称
        String signature = "安合出行"; //签名名称

        //必填,全局号码格式(包含国家码),示例:+8615123456789,多个号码之间用英文逗号分隔
        String receiver = "+86" + phone; //短信接收人号码

 ahtravel.sql

Diff too large