liujie
5 天以前 88141ff7e83f44feb56f8cbcaaf84260d0626883
添加时间
4个文件已修改
29 ■■■■ 已修改文件
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
@@ -437,7 +437,8 @@
    @TableField("promotion")
    private Integer promotion;
    
    private Date successTime;
    private String promotionUser;
    
    private String promotionPhone;
@@ -496,7 +497,15 @@
     * 原始订单id
     */
    private Integer oldOrderId;
    public Date getSuccessTime() {
        return successTime;
    }
    public void setSuccessTime(Date successTime) {
        this.successTime = successTime;
    }
    public String getPromotionUser() {
        return promotionUser;
    }
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -2994,6 +2994,7 @@
                orderPrivateCar.setPromotionDriverId(userInfo.getBindDriverId());
                orderPrivateCar.setPromotionMoney(bigDecimal);
                orderPrivateCar.setPromotionActivityId(tDriverPromotionActivity.getId());
                orderPrivateCar.setSuccessTime(new Date());
                this.baseMapper.updateById(orderPrivateCar);
            }
        }
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
@@ -366,6 +366,8 @@
     */
    @TableField("abnormal")
    private Integer abnormal;
    private Date successTime;
    
    
    /**
@@ -423,7 +425,15 @@
     * 原始订单id
     */
    private Integer oldOrderId;
    public Date getSuccessTime() {
        return successTime;
    }
    public void setSuccessTime(Date successTime) {
        this.successTime = successTime;
    }
    public Long getPromotionActivityId() {
        return promotionActivityId;
    }
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -2497,8 +2497,7 @@
                orderTaxi.setPromotionDriverId(userInfo.getBindDriverId());
                orderTaxi.setPromotionMoney(bigDecimal);
                orderTaxi.setPromotionActivityId(tDriverPromotionActivity.getId());
                orderTaxi.setSuccessTime(new Date());
                this.baseMapper.updateById(orderTaxi);
            }
        }