DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
@@ -440,6 +440,27 @@ // 推广司机id private Integer promotionDriverId; private String promotionUser; private String promotionPhone; 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 Integer getPromotion() { return promotion; } DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -238,7 +238,13 @@ // 是否推广订单 Integer promotion = isPromotion(uid); orderPrivateCar.setPromotion(promotion); if(promotion!=null){ orderPrivateCar.setPromotion(2); Driver driver1 = driverService.selectById(promotion); orderPrivateCar.setPromotionUser(driver1.getName()); orderPrivateCar.setPromotionPhone(driver1.getPhone()); orderPrivateCar.setPromotionDriverId(promotion); } this.updateById(orderPrivateCar);
@@ -357,6 +357,26 @@ private Date voiceTime; private String promotionUser; private String promotionPhone; 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 Integer getPromotion() { return promotion; } DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -212,8 +212,15 @@ // } // 是否推广订单 // 是否推广订单 Integer promotion = isPromotion(uid); orderTaxi.setPromotion(promotion); if(promotion!=null){ orderTaxi.setPromotion(2); Driver driver1 = driverService.selectById(promotion); orderTaxi.setPromotionUser(driver1.getName()); orderTaxi.setPromotionPhone(driver1.getPhone()); orderTaxi.setPromotionDriverId(promotion); } this.updateById(orderTaxi); @@ -293,7 +300,7 @@ String registAreaCode = userInfo.getRegistAreaCode(); TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", registAreaCode).ge("startTime", new Date()).lt("endTime", new Date()).last("AND FIND_IN_SET(" + 1 + ", bizType) limit 1")); if(tDriverPromotionActivity!=null){ return 2; return userInfo.getBindDriverId(); } } return null; UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
@@ -434,6 +434,10 @@ private Integer promotion; private String promotionUser; private String promotionPhone; /** * 乘客反馈情况 @@ -468,6 +472,22 @@ private Integer responsibilityType; 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 Integer getResponsibilityType() { return responsibilityType; } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -600,7 +600,13 @@ // 是否推广订单 Integer promotion = isPromotion(uid); orderPrivateCar.setPromotion(promotion); if(promotion!=null){ orderPrivateCar.setPromotion(2); Driver driver = driverService.selectById(promotion); orderPrivateCar.setPromotionUser(driver.getName()); orderPrivateCar.setPromotionPhone(driver.getPhone()); orderPrivateCar.setPromotionDriverId(promotion); } this.insert(orderPrivateCar); @@ -746,7 +752,7 @@ String registAreaCode = userInfo.getRegistAreaCode(); TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", registAreaCode).ge("startTime", new Date()).lt("endTime", new Date()).last("AND FIND_IN_SET(" + 1 + ", bizType) limit 1")); if(tDriverPromotionActivity!=null){ return 2; return userInfo.getBindDriverId(); } } return null; @@ -2744,7 +2750,9 @@ public void promotion(Integer orderId) { OrderPrivateCar orderPrivateCar = this.baseMapper.selectById(orderId); UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId()); if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()<=System.currentTimeMillis()){ // if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()<=System.currentTimeMillis()){ // 开始绑定的 后面到期也结算 if(orderPrivateCar.getPromotionDriverId()!=null ){ String registAreaCode = userInfo.getRegistAreaCode(); TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", registAreaCode).ge("startTime", new Date()).lt("endTime", new Date()).last("AND FIND_IN_SET(" + 1 + ", bizType) limit 1")); if(tDriverPromotionActivity!=null){ UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -2310,7 +2310,7 @@ public void promotion(Integer orderId) { OrderTaxi orderTaxi = this.baseMapper.selectById(orderId); UserInfo userInfo = userInfoService.selectById(orderTaxi.getUserId()); if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()<=System.currentTimeMillis()){ if(orderTaxi.getPromotionDriverId()!=null){ String registAreaCode = userInfo.getRegistAreaCode(); TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", registAreaCode).ge("startTime", new Date()).lt("endTime", new Date()).last("AND FIND_IN_SET(" + 2 + ", bizType) limit 1")); if(tDriverPromotionActivity!=null){
