活动

liujie

5 天以前 8f659c583bf38eb1fecc8c7790b56d268225eb19

 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){